【需求】物料新增存货属性

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

@@ -20,7 +20,7 @@ public enum ChanjetInterfaceEnum {
     CREATE_PROCEDURE("/tplus/api/v2/process/Create", "创建工序", CreateProcedureReqVO.class, Long.class),
     CREATE_EMPLOYEE("/tplus/api/v2/person/Create", "创建员工", CreateOrUpdateEmployeeReqVO.class, Long.class),
     UPDATE_EMPLOYEE("/tplus/api/v2/person/Update", "更新员工", CreateOrUpdateEmployeeReqVO.class, Boolean.class),
-    QUERY_INVENTORY("/tplus/api/v2/inventory/Query", "查询物料", CreateOrUpdateEmployeeReqVO.class, QueryMaterialResVO.class),
+    QUERY_INVENTORY("/tplus/api/v2/inventory/Query", "查询物料", QueryMaterialReqVO.class, QueryMaterialResVO.class),
     QUERY_SALE_ORDER_LIST("/tplus/api/v2/SaleOrderOpenApi/FindVoucherList", "查询销售订单列表", QuerySaleOrderListReqVO.class, ListResultResVO.class),
     QUERY_SALE_ORDER("/tplus/api/v2/SaleOrderOpenApi/GetVoucherDTO", "查询销售订单", QuerySaleOrderReqVO.class, ResultResVO.class),
     CREATE_REPORT("/tplus/api/v2/ManufactureReportOpenApi/Create", "创建报工记录", CreateReportReqVO.class, ResultResVO.class),

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";
+        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 TS;
 

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

@@ -26,8 +26,33 @@ public class QueryMaterialResVO {
     private ProductInfo ProductInfo;
     private String ImageFile;
     private String TS;
+    private Object IsPurchase;
+    private Object IsSale;
+    private Object IsMadeSelf;
+    private Object IsMaterial;
+    private Object IsPhantom;
+    private Object IsLaborCost;
+    private Object IsEshop;
+    private Integer inventoryProperty;
 
     public Long getID() {
         return ID == null ? ID : ChanjetSpi.getIdPrefix()+ID;
     }
+
+    public Integer getInventoryProperty(){
+        int ip = 0b0000000;
+        ip += isTrue(getIsPurchase()) ? 0b1 : 0;
+        ip += isTrue(getIsSale()) ? 0b10 : 0;
+        ip += isTrue(getIsMadeSelf()) ? 0b100 : 0;
+        ip += isTrue(getIsMaterial()) ? 0b1000 : 0;
+        ip += isTrue(getIsPhantom()) ? 0b10000 : 0;
+        ip += isTrue(getIsLaborCost()) ? 0b100000 : 0;
+        ip += isTrue(getIsEshop()) ? 0b1000000 : 0;
+        return ip;
+    }
+
+    private boolean isTrue(Object val){
+        return "true".equalsIgnoreCase(String.valueOf(val));
+    }
+
 }

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

@@ -23,6 +23,9 @@ public class MaterialRespVO {
     @ExcelProperty("物料编码")
     private String code;
 
+    @Schema(description = "存货属性")
+    private Integer inventoryProperty;
+
     @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
     @ExcelProperty("物料名称")
     private String name;

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

@@ -17,6 +17,9 @@ public class MaterialSaveReqVO {
     @Schema(description = "物料编码", requiredMode = Schema.RequiredMode.REQUIRED)
     private String code;
 
+    @Schema(description = "存货属性")
+    private Integer inventoryProperty;
+
     @Schema(description = "物料名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
     @NotEmpty(message = "物料名称不能为空")
     private String name;

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

@@ -137,6 +137,8 @@ public class MaterialDO extends TenantBaseDO {
      */
     private String logo;
 
+    private Integer inventoryProperty;
+
     @TableField(exist = false)
     private String mainSupplierName;
 

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

@@ -518,6 +518,7 @@ public class ChanjetManager {
                                 .setShortName(vo.getShorthand())
                                 .setSpec(vo.getSpecification())
                                 .setDescription(vo.getInventoryDescript())
+                                .setInventoryProperty(vo.getInventoryProperty())
                         ;
                         if(vo.getUnitByStock() != null && !StringUtils.isEmpty(vo.getUnitByStock().getCode())){
                             aDO.setUnit(vo.getUnitByStock().getCode());
@@ -543,6 +544,7 @@ public class ChanjetManager {
                                 .setShortName(vo.getShorthand())
                                 .setSpec(vo.getSpecification())
                                 .setDescription(vo.getInventoryDescript())
+                                .setInventoryProperty(vo.getInventoryProperty())
                         ;
                         if(vo.getUnitByStock() != null && !StringUtils.isEmpty(vo.getUnitByStock().getCode())){
                             aDO.setUnit(vo.getUnitByStock().getCode());

sql/v1.0.0/2.business/1.structure.sql

@@ -171,3 +171,5 @@ ALTER TABLE project_sale_order_sub ADD COLUMN `warehouse_id` BIGINT ( 20 ) COMME
 
 ALTER TABLE `project_sale_order` ADD COLUMN `warehouse_id` BIGINT ( 20 ) DEFAULT NULL COMMENT '仓库id' AFTER `order_status`;
 
+ALTER TABLE base_material ADD COLUMN inventory_property INT ( 11 ) DEFAULT '0' COMMENT '物料属性' AFTER `description`;
+