委托加工添加发货工厂字段和明细添加金属元素字段

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/ErpConstants.java

@@ -17,4 +17,7 @@ public class ErpConstants {
     public static final String SALES_DOCUMENT_REQUEST_FLAG_D = "D";//删除
     public static final String SALES_DOCUMENT_REQUEST_FLAG_I = "I";//插入
     public static final String CONSTANTS_L = "L";//科目类别L
+    public static final String TOKEN_ = "-";//连接标识
+    public static final String DATE_FORMAT_YYYYMMDD = "yyyyMMdd";
+    public static final String MTRL_ZHONGTONG_CODE = "mtrlZhongtongCode";
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailPageReqVO.java

@@ -103,5 +103,11 @@ public class EntrustOrderDetailPageReqVO extends PageParam {
     private BigDecimal recoveryRate;
     @Schema(description = "行项目号")
     private Integer lineNumber;
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+    @Schema(description = "金属元素名称")
+    private String elementName;
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
 
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailRespVO.java

@@ -142,5 +142,14 @@ public class EntrustOrderDetailRespVO {
     @Schema(description = "删除标识")
     @ExcelProperty("删除标识")
     private Boolean deleted;
+    @ExcelProperty("金属元素缩写")
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+    @ExcelProperty("金属元素名称")
+    @Schema(description = "金属元素名称")
+    private String elementName;
+    @ExcelProperty("金属元素编码")
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
 
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderDetailSaveReqVO.java

@@ -105,4 +105,11 @@ public class EntrustOrderDetailSaveReqVO {
     private BigDecimal recoveryRate;
     @Schema(description = "行项目号")
     private Integer lineNumber;
+
+    @Schema(description = "金属元素缩写")
+    private String elementAbbreviation;
+    @Schema(description = "金属元素名称")
+    private String elementName;
+    @Schema(description = "金属元素编码")
+    private String elementNumber;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderPageReqVO.java

@@ -130,5 +130,13 @@ public class EntrustOrderOrderPageReqVO extends PageParam {
 
     @Schema(description = "物料类型", example = "张三")
     private String mtrlTp;
+    @Schema(description = "发货工厂名称", example = "张三")
+    private String sendFactoryName;
+    @Schema(description = "发货工厂编码", example = "张三")
+    private String sendFactoryNumber;
+    @Schema(description = "发货库位名称", example = "张三")
+    private String sendWarehouseName;
+    @Schema(description = "发货库位编码", example = "张三")
+    private String sendWarehouseNumber;
 
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderRespVO.java

@@ -175,4 +175,16 @@ public class EntrustOrderOrderRespVO {
     @ExcelProperty("物料类型")
     @Schema(description = "物料类型", example = "张三")
     private String mtrlTp;
+    @ExcelProperty("发货工厂名称")
+    @Schema(description = "发货工厂名称", example = "张三")
+    private String sendFactoryName;
+    @ExcelProperty("发货工厂编码")
+    @Schema(description = "发货工厂编码", example = "张三")
+    private String sendFactoryNumber;
+    @ExcelProperty("发货库位名称")
+    @Schema(description = "发货库位名称", example = "张三")
+    private String sendWarehouseName;
+    @ExcelProperty("发货库位编码")
+    @Schema(description = "发货库位编码", example = "张三")
+    private String sendWarehouseNumber;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/entrustorder/vo/EntrustOrderOrderSaveReqVO.java

@@ -151,5 +151,12 @@ public class EntrustOrderOrderSaveReqVO {
 
     @Schema(description = "物料类型", example = "张三")
     private String mtrlTp;
-
+    @Schema(description = "发货工厂名称", example = "张三")
+    private String sendFactoryName;
+    @Schema(description = "发货工厂编码", example = "张三")
+    private String sendFactoryNumber;
+    @Schema(description = "发货库位名称", example = "张三")
+    private String sendWarehouseName;
+    @Schema(description = "发货库位编码", example = "张三")
+    private String sendWarehouseNumber;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderDetailDO.java

@@ -176,4 +176,20 @@ public class EntrustOrderDetailDO extends BusinessBaseDO {
 
     @TableField("LINE_NUM")
     private Integer lineNumber;
+
+    /**
+     * 金属元素缩写
+     */
+    @TableField("ELEM_ABBR")
+    private String elementAbbreviation;
+    /**
+     * 金属元素名称
+     */
+    @TableField("ELEM_NAME")
+    private String elementName;
+    /**
+     * 金属元素编码
+     */
+    @TableField("ELEM_NUM")
+    private String elementNumber;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/entrustorder/EntrustOrderOrderDO.java

@@ -230,4 +230,26 @@ public class EntrustOrderOrderDO extends BusinessBaseDO {
      */
     @TableField("MTRL_TP")
     private String mtrlTp;
+
+    /**
+     * 发货工厂名称
+     */
+    @TableField("SND_FACT_NAME")
+    private String sendFactoryName;
+    /**
+     * 发货工厂编码
+     */
+    @TableField("SND_FACT_NUM")
+    private String sendFactoryNumber;
+
+    /**
+     * 发货库位名称
+     */
+    @TableField("SND_WRH_NAME")
+    private String sendWarehouseName;
+    /**
+     * 发货库位编码
+     */
+    @TableField("SND_WRH_NUM")
+    private String sendWarehouseNumber;
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/entrustorder/EntrustOrderDetailServiceImpl.java

@@ -57,6 +57,7 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService
     public EntrustOrderDetailRespVO createEntrustOrderDetail(EntrustOrderDetailSaveReqVO createReqVO) {
         // 插入
         EntrustOrderDetailDO entrustOrderDetail = BeanUtils.toBean(createReqVO, EntrustOrderDetailDO.class);
+        setElemInfo(entrustOrderDetail);
         entrustOrderDetailMapper.insert(entrustOrderDetail);
         // 返回
         return BeanUtils.toBean(entrustOrderDetail, EntrustOrderDetailRespVO.class);
@@ -68,6 +69,7 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService
         validateEntrustOrderDetailExists(updateReqVO.getId());
         // 更新
         EntrustOrderDetailDO updateObj = BeanUtils.toBean(updateReqVO, EntrustOrderDetailDO.class);
+        setElemInfo(updateObj);
         entrustOrderDetailMapper.updateById(updateObj);
     }
 
@@ -188,6 +190,7 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService
     @Override
     public List<EntrustOrderDetailRespVO> insertBatchSomeColumn(List<EntrustOrderDetailSaveReqVO> entrustOrderOrderDetails) {
         List<EntrustOrderDetailDO> entrustOrderDetail = BeanUtils.toBean(entrustOrderOrderDetails, EntrustOrderDetailDO.class);
+        entrustOrderDetail.forEach(this::setElemInfo);
         entrustOrderDetailMapper.insertBatch(entrustOrderDetail);
         return BeanUtils.toBean(entrustOrderDetail, EntrustOrderDetailRespVO.class);
     }
@@ -195,6 +198,7 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService
     @Override
     public void updateBatchSomeColumn(List<EntrustOrderDetailSaveReqVO> entrustOrderOrderDetails) {
         List<EntrustOrderDetailDO> updateList = BeanUtils.toBean(entrustOrderOrderDetails, EntrustOrderDetailDO.class);
+        updateList.forEach(this::setElemInfo);
         entrustOrderDetailMapper.insertOrUpdate(updateList);
     }
 
@@ -227,17 +231,17 @@ public class EntrustOrderDetailServiceImpl implements EntrustOrderDetailService
         return mtrlZhongtongCode;
     }
 
-//    private void setElemInfo(EntrustOrderDetailDO entrustOrderDetailDO) {
+    private void setElemInfo(EntrustOrderDetailDO entrustOrderDetailDO) {
-//        if (entrustOrderDetailDO.getElemAbbr() == null) {
+        if (entrustOrderDetailDO.getElementAbbreviation() == null) {
-//            return;
+            return;
-//        }
+        }
-//        ElementDO elementBySymbol = elementService.getElementBySymbol(entrustOrderDetailDO.getElemAbbr());
+        ElementDO elementBySymbol = elementService.getElementBySymbol(entrustOrderDetailDO.getElementAbbreviation());
-//        if (elementBySymbol != null) {
+        if (elementBySymbol != null) {
-//            entrustOrderDetailDO.setElemName(elementBySymbol.getName());
+            entrustOrderDetailDO.setElementName(elementBySymbol.getName());
-//            entrustOrderDetailDO.setElemCdg(elementBySymbol.getCoding());
+            entrustOrderDetailDO.setElementNumber(elementBySymbol.getCoding());
-//        } else {
+        } else {
-//            log.warn("元素【{}】不存在,订单ID【{}】", entrustOrderDetailDO.getElemAbbr(), entrustOrderDetailDO.getOrdId());
+            log.warn("元素【{}】不存在,订单ID【{}】", entrustOrderDetailDO.getElementAbbreviation(), entrustOrderDetailDO.getOrderId());
-//        }
+        }
-//
+
-//    }
+    }
 }