From 5ec7505d5b4e36bba894768a732e31a07c75847b Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Mon, 13 May 2024 14:13:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E7=89=A9?= =?UTF-8?q?=E6=96=99=E6=96=B0=E5=A2=9E=E5=AD=98=E8=B4=A7=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/chanjet/ChanjetInterfaceEnum.java | 2 +- .../admin/chanjet/vo/QueryMaterialReqVO.java | 2 +- .../admin/chanjet/vo/QueryMaterialResVO.java | 25 +++++++++++++++++++ .../admin/material/vo/MaterialRespVO.java | 3 +++ .../admin/material/vo/MaterialSaveReqVO.java | 3 +++ .../dal/dataobject/material/MaterialDO.java | 2 ++ .../module/biz/manager/ChanjetManager.java | 2 ++ sql/v1.0.0/2.business/1.structure.sql | 2 ++ 8 files changed, 39 insertions(+), 2 deletions(-) diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java index 9a80bec2..f8308930 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/ChanjetInterfaceEnum.java +++ b/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), diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java index 5b15acf5..394f9739 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialReqVO.java +++ b/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; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialResVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialResVO.java index 4febf644..0319620f 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/chanjet/vo/QueryMaterialResVO.java +++ b/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)); + } + } diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/material/vo/MaterialRespVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/material/vo/MaterialRespVO.java index 8a67faaf..4016ffce 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/material/vo/MaterialRespVO.java +++ b/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; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/material/vo/MaterialSaveReqVO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/material/vo/MaterialSaveReqVO.java index 36b32488..aa447a8e 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/controller/admin/material/vo/MaterialSaveReqVO.java +++ b/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; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java index c62a783e..afef07d1 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/dal/dataobject/material/MaterialDO.java +++ b/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; diff --git a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java b/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java index 1779fb72..402f2d67 100644 --- a/mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java +++ b/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()); diff --git a/sql/v1.0.0/2.business/1.structure.sql b/sql/v1.0.0/2.business/1.structure.sql index 6ca3f2a2..0c3ec761 100644 --- a/sql/v1.0.0/2.business/1.structure.sql +++ b/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`; +