【物料管理】 物料信息中增加字段：外部编码、颜色，同步数据时，将接口中的物料编码和颜色同步到该字段上

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialFreeItemBriefResVO.java

@@ -0,0 +1,18 @@
+package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author chenxi
+ * @date 2024-04-28 11:05
+ */
+@Data
+public class QueryMaterialFreeItemBriefResVO {
+
+    protected String name;
+    protected String title;
+    protected Boolean mustInput;
+    protected List<QueryMaterialRangeResVO> range;
+}

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialRangeResVO.java

@@ -0,0 +1,16 @@
+package com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.vo;
+
+import lombok.Data;
+
+/**
+ * @author chenxi
+ * @date 2024-04-28 11:05
+ */
+@Data
+public class QueryMaterialRangeResVO {
+
+    protected String id;
+    protected String code;
+    protected String name;
+    protected Boolean disabled;
+}

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java

@@ -30,7 +30,7 @@ public class QueryMaterialReqVO extends AbstractChanjetContent {
 
         private Integer pageSize = 100;
 
-        private String SelectFields = "ID,Code,Name,Shorthand,Specification,Disabled,DefaultBarCode,InventoryClass.Code,InventoryClass.Name,UnitByStock.Code,UnitByStock.Name,ProductInfo.ID,ProductInfo.Code,ProductInfo.Name,ImageFile,InventoryDescript,TS,IsPurchase,IsSale,IsMadeSelf,IsMaterial,IsPhantom,IsLaborCost,IsEshop";
+        private String SelectFields = "ID,Code,Name,Shorthand,Specification,Disabled,DefaultBarCode,InventoryClass.Code,InventoryClass.Name,UnitByStock.Code,UnitByStock.Name,ProductInfo.ID,ProductInfo.Code,ProductInfo.Name,ImageFile,InventoryDescript,TS,IsPurchase,IsSale,IsMadeSelf,IsMaterial,IsPhantom,IsLaborCost,IsEshop,freeitembriefinfo";
 
         private String TS;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialResVO.java

@@ -6,6 +6,8 @@ import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.ProductInfo;
 import com.chanko.yunxi.mes.module.biz.controller.admin.chanjet.dto.UnitByStock;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author chenxi
  * @date 2024-04-18 14:32
@@ -34,6 +36,7 @@ public class QueryMaterialResVO {
     private Object IsLaborCost;
     private Object IsEshop;
     private Integer inventoryProperty;
+    private List<QueryMaterialFreeItemBriefResVO> freeitembriefinfo;
 
     public Long getID() {
         return ID == null ? ID : ChanjetSpi.getIdPrefix()+ID;

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java

@@ -157,6 +157,9 @@ public class MaterialDO extends TenantBaseDO {
     private Long processId;
     private Long safeAmount;
 
+    private String color;
+    private String externalCode;
+
     @TableField(exist = false)
     private String processCode;
 

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -601,11 +601,15 @@ public class ChanjetManager {
                         if(!StringUtils.isEmpty(vo.getImageFile())){
                             aDO.setLogo(vo.getImageFile());
                         }
+                        if(CollUtil.isNotEmpty(vo.getFreeitembriefinfo())){
+                            aDO.setColor(vo.getFreeitembriefinfo().get(0).getRange().get(0).getName());
+                        }
                         updateList.add(aDO);
                     }else{
                         MaterialDO aDO = new MaterialDO();
                         aDO.setId(vo.getID())
                                 .setCode(vo.getCode())
+                                .setExternalCode(vo.getCode())
                                 .setStatus(!vo.getDisabled() ? ValidStatusEnum.VALID.getCode() : ValidStatusEnum.INVALID.getCode())
                                 .setName(vo.getName())
                                 .setShortName(vo.getShorthand())
@@ -627,6 +631,9 @@ public class ChanjetManager {
                         if(!StringUtils.isEmpty(vo.getImageFile())){
                             aDO.setLogo(vo.getImageFile());
                         }
+                        if(CollUtil.isNotEmpty(vo.getFreeitembriefinfo())){
+                            aDO.setColor(vo.getFreeitembriefinfo().get(0).getRange().get(0).getName());
+                        }
                         insertList.add(aDO);
                     }
                 });