From bf599dd8a16f7b12ea27c03e06b1129a7b91c033 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 5 Sep 2024 15:47:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=AF=BC=E5=87=BA=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E4=BF=AE=E6=94=B9=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E4=BC=B0=E4=BB=B7=E5=B7=A5=E7=A8=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8C=89=E9=92=AE=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysSalesOrderController.java       |  4 ----
 .../mapper/system/SysSalesOrderMapper.xml         | 15 ++++++++++++---
 .../templates/sales/estimate/engineeringAdd.html  | 10 +++++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
index 00b50002..77e6c690 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/controller/SysSalesOrderController.java
@@ -161,10 +161,6 @@ public class SysSalesOrderController extends BaseController
     @ResponseBody
     public AjaxResult exportAll(SysSalesOrderVo sysSalesOrder)
     {
-
-        //通过用户名找到业务登录名，重新给业务员赋值
-        String tempLoginName = sysSalesOrderService.convertName(sysSalesOrder);
-        sysSalesOrder.setBusinessMembers(tempLoginName);
         List<SysSalesOrderVo> list = sysSalesOrderService.selectSysSalesOrderAllList(sysSalesOrder);
         ExcelUtil<SysSalesOrderVo> util = new ExcelUtil<SysSalesOrderVo>(SysSalesOrderVo.class);
         return util.exportExcel(list, "销售订单数据");
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
index ba99e8a2..488ebcb0 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
@@ -181,7 +181,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where dict_type = 'processType'
         ) as p
         on s.instance_type = p.dict_value
-        left join sys_sales_order_child as c on s.sales_order_code = c.quoteId
         <where>
             <if test="salesOrderCode != null  and salesOrderCode != ''"> and s.sales_order_code like concat('%', #{salesOrderCode}, '%')</if>
             <if test="salesOrderNumber != null  and salesOrderNumber != ''"> and s.sales_order_number like concat('%', #{salesOrderNumber}, '%')</if>
@@ -201,8 +200,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginCreateTime != null  and params.beginCreatTime != ''  and params.endCreateTime != null and params.endCreateTime != '' ">
                 and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}
             </if>
-            <if test="materialCode != null and materialCode != ''"> and c.materialCode like concat('%', #{materialCode}, '%')</if>
-            <if test="materialName != null and materialName != ''">and c.materialName like concat('%',#{materialName},'%')</if>
+            <if test="materialCode != null and materialCode != '' || materialName!= null and materialName !=''">
+                and s.sales_order_code in (
+                select quoteId from sys_sales_order_child as child where
+                quoteId = s.sales_order_code
+                <if test="materialCode != null and materialCode != ''">
+                    and child.materialCode like concat('%',#{materialCode},'%')
+                </if>
+                <if test="materialName != null and materialName != ''">
+                    and child.materialName like concat('%',#{materialName},'%')
+                </if>
+                )
+            </if>
         </where>
         group by s.sales_order_id
         order by s.audit_status asc,s.create_time desc
diff --git a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
index c5e3d306..33bc83fe 100644
--- a/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
+++ b/ruoyi-admin/src/main/resources/templates/sales/estimate/engineeringAdd.html
@@ -215,6 +215,15 @@
         {
           checkbox: true
         },
+        {
+          title: '添加物料',
+          align: 'center',
+          formatter: function(value, row, index) {
+            var actions = [];
+            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="addChildMaterial(\'' + row.estimateDetailId + '\')"><i class="fa fa-edit"></i>添加物料</a> ');
+            return actions.join('');
+          }
+        },
         {
           title: '销售估价详情ID',
           field: 'estimateDetailId',
@@ -311,7 +320,6 @@
           align: 'center',
           formatter: function(value, row, index) {
             var actions = [];
-            actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="addChildMaterial(\'' + row.estimateDetailId + '\')"><i class="fa fa-edit"></i>添加物料</a> ');
             actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeMaterialRow(\'' + row.materialNo + '\')"><i class="fa fa-remove"></i>删除</a> ');
             return actions.join('');
           }

From f2de31b18725c6a2f35315e4c62b045416546865 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 5 Sep 2024 15:58:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=EF=BC=9A?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E6=A0=87=E8=AF=86=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysCustomerMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index 08db9894..ece1fb40 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="selectSysCustomerList" parameterType="SysCustomerVo" resultMap="SysCustomerResult">
-        select s.id,s.enterprise_code,s.enterprise_name,s.english_name,s.customer_abbreviation ,s.customer_purser ,
+        select s.id,s.enterprise_code,s.enterprise_name,s.english_name,s.customer_abbreviation ,s.customer_purser , s.customer_sign,
                s.export_sales,s.customer_country,s.postal_code,s.customer_address,s.legal_representative,s.established_time,
                s.invoicing_customer_name,s.invoicing_company_name,s.invoice_code,s.deposit_bank,s.bank_account,s.common_currency,
                s.confirm_tax,s.tax_rate,s.integrity_rating,s.rmb_registered_capital,s.registered_capital,s.payment_terms,

From 240989b636ad52aca64734db318f681325968054 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 5 Sep 2024 16:19:17 +0800
Subject: [PATCH 3/4] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E5=AE=A2=E6=88=B7=E8=B5=84=E6=96=99=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E4=B8=8A=E5=AD=97=E5=85=B8=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E8=B4=A2=E5=8A=A1=E5=BA=94=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A6=E6=AC=BE=E7=BB=93=E6=A1=88=E5=90=8E=E7=AB=AF=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E7=BB=93=E6=A1=88=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E4=BF=AE=E6=94=B9=E5=85=B3=E8=81=94=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E7=9A=84=E5=AE=A2=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E7=9A=84=E5=AE=A2=E6=88=B7=E6=A0=87=E8=AF=86=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E4=B8=8B=E8=BF=87=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FinancialReceivablesServiceImpl.java     | 8 ++++++++
 .../main/java/com/ruoyi/system/domain/SysCustomer.java    | 4 +++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java
index 93a468de..017c9d5d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/financial/service/impl/FinancialReceivablesServiceImpl.java
@@ -290,6 +290,14 @@ public class FinancialReceivablesServiceImpl implements IFinancialReceivablesSer
        if (updateSysSalesOrderResult <= 0){
            throw new BusinessException("销售订单结案失败");
        }
+       //更改客户资料客户标识 为下过单
+        SysCustomerVo sysCustomerVo = sysCustomerMapper.selectSysCustomerByEnterpriseCode(sysSalesOrderVo.getEnterpriseCode());
+       sysCustomerVo.setCustomerSign("2");
+        int updateSysCustomer = sysCustomerMapper.updateSysCustomer(sysCustomerVo);
+        if (updateSysCustomer <= 0){
+            throw new BusinessException("客户资料更改客户标识失败");
+        }
+
         return result;
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
index ea8c5197..9d11d2d6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomer.java
@@ -166,7 +166,9 @@ public class SysCustomer extends BaseEntity
     private String auditStatus;
     @Excel(name = "客户的状态")
     private String useStatus;
-    @Excel(name = "客户标识 0表示潜在客户(仅报价) 1表示 客户(已下单)")
+
+    //1表示潜在客户(仅报价) 2表示 客户(已下单)
+    @Excel(name = "客户标识",dictType = "sys_customer_sign")
     private String customerSign;
 
     private List<String> currency;

From 0507f7602ce4f857cc87e53d27aa44177cbba702 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 5 Sep 2024 16:26:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?[fix]=20=E9=94=80=E5=94=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E5=BD=95=E5=85=A5=E6=97=B6=E9=97=B4=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E7=AD=9B=E9=80=89=E6=95=B0=E6=8D=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E5=90=8E=E7=AB=AF=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysCustomerMapper.xml     | 2 +-
 .../src/main/resources/templates/system/customer/customer.html | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
index ece1fb40..c6b20c28 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerMapper.xml
@@ -119,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="customerPurser != null  and customerPurser != ''"> and s.customer_purser like concat('%', #{customerPurser}, '%')</if>
             <if test="customerAbbreviation != null  and customerAbbreviation != ''"> and s.customer_abbreviation like concat('%', #{customerAbbreviation}, '%')</if>
             <if test="deliveryAddress != null  and deliveryAddress != ''"> and s.delivery_address like concat('%', #{deliveryAddress}, '%')</if>
-            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.first_add_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and s.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
             <if test="customerSign != null  and customerSign != ''"> and s.customer_sign = #{customerSign}</if>
         </where>
         order by s.audit_status asc, s.create_time desc
diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
index e6fd24d9..0f29bfaf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
+++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html
@@ -545,9 +545,6 @@
                 },
                 {title: '录入时间',field: 'createTime',
                     sortable: true,
-                    formatter: function (value, row, index) {
-                        if (value == null) {return " ";} else { return value;}
-                    }
                 },
                 {title: '上次修改时间',field: 'updateTime',},
                 {title: '操作',align: 'center',