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

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -203,9 +203,9 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             //生成工单编号,以及设置默认状态
             w.setCode(CodeEnum.WORK_ORDER.getCode());
             w.setStatus(0);
-            if (ObjectUtil.isNotEmpty(w.getSourceId()) && w.getSource() == "1") {//外销合同生产数据
+            if (ObjectUtil.isNotEmpty(w.getSourceId()) && "1".equals(w.getSource())) {//外销合同生产数据
                 ContractProduct contractProduct = contractProductService.getById(w.getSourceId());
-                if (ObjectUtil.isNotEmpty(contractProduct)) {
+                if (ObjectUtil.isEmpty(contractProduct)) {
                     throw new ServiceException("该合同产品不存在,请检查");
                 }
                 BigDecimal expendQuantity = contractProduct.getExpendQuantity().subtract(w.getQuantity());

hx-purchase/src/main/java/com/fjhx/purchase/entity/purchase/po/Purchase.java

@@ -120,4 +120,13 @@ public class Purchase extends BasePo {
      * 采购单个数
      */
     private Integer count;
+
+    /**
+     * 业务来源 0自建  1外销合同采购 2:样品单
+     */
+    private Integer dataResource;
+    /**
+     * 业务来源id
+     */
+    private Long dataResourceId;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractProductVo.java

@@ -182,4 +182,9 @@ public class ContractProductVo extends ContractProduct {
      */
     private String corporationName;
 
+    /**
+     * 业务员id
+     */
+    private Long salesmanId;
+
 }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractProductServiceImpl.java

@@ -23,6 +23,7 @@ import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.utils.UserUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -110,6 +111,9 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
             item.setCorporationName(corporation.getName());
         });
 
+        //赋值业务员名称
+        UserUtil.assignmentNickName(list, ContractProductVo::getSalesmanId, ContractProductVo::setUserName);
+
         return page;
     }
 

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -6,18 +6,21 @@
         SELECT t1.id,
                t1.contract_id,
                t1.product_id,
-               t2.`code`               AS contractCode,
-               t2.user_name            AS userName,
-               t2.version              AS contractVersion,
-               t1.expend_quantity      AS expendQuantity,
+               t2.`code`          AS contractCode,
+               t2.user_name       AS userName,
+               t2.create_user     AS salesmanId,
+               t2.version         AS contractVersion,
+               t1.expend_quantity AS expendQuantity,
                (SELECT create_time
                 FROM claim_contract
                 WHERE contract_id = t2.id
                 ORDER BY create_time DESC
-                LIMIT 1)               AS claimTime,
-               t2.contract_template_id AS contractTemplateId
+                                     LIMIT 1)               AS claimTime,
+               t2.contract_template_id AS contractTemplateId,
+               t1.quantity
         FROM contract_product t1
-                 LEFT JOIN contract t2 ON t1.contract_id = t2.id
+            LEFT JOIN contract t2
+        ON t1.contract_id = t2.id
             ${ew.customSqlSegment}
     </select>