Merge remote-tracking branch 'origin/dev' into dev

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;
     }
 

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, "销售订单数据");

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;

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,
@@ -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

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

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('');
           }

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',