Sfoglia il codice sorgente

删除明细表租户id,增加specification规格型号字段

luobo 1 settimana fa
parent
commit
d3e4b17f6d

+ 1 - 1
easydo-mes/src/main/java/easydo/technology/model/MaterialRequisitionItem.java

@@ -14,6 +14,7 @@ public class MaterialRequisitionItem {
     private String requisitionId;
     private String materialCode;
     private String materialName;
+    private String specification;
     private BigDecimal requiredQuantity;
     private BigDecimal actualQuantity;
     private BigDecimal returnQuantity;
@@ -21,6 +22,5 @@ public class MaterialRequisitionItem {
     private String unit;
     private String warehouseId;
     private String remark;
-    private String tenantId;
     private String createTime;
 }

+ 4 - 2
easydo-mes/src/main/java/easydo/technology/service/impl/MaterialRequisitionServiceImpl.java

@@ -314,6 +314,7 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
             // 生成领料单编号
             String requisitionCode = flowNoService.generateMaterialRequisitionCode(requisition, connection);
             requisition.setCode(requisitionCode);
+            requisition.setName(requisitionCode);
             
             jdbcClient.jdbcInsert(requisition, connection);
             
@@ -333,6 +334,7 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
                 
                 // 查询物料信息获取单位
                 String unit = null;
+                String specification = null;
                 if (subBom.getMaterialCode() != null) {
                     ProductMaterial materialQuery = new ProductMaterial();
                     materialQuery.setCode(subBom.getMaterialCode());
@@ -340,11 +342,12 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
                     List<ProductMaterial> materials = jdbcClient.getJdbcList(materialQuery, connection);
                     if (materials != null && !materials.isEmpty()) {
                         unit = materials.get(0).getUnit();
+                        specification = materials.get(0).getSpecification();
                     }
                 }
                 item.setUnit(unit);
+                item.setSpecification(specification);
                 
-                item.setTenantId(dispatch.getTenantId());
                 item.setCreateTime(FORMATTER.format(LocalDateTime.now()));
                 
                 jdbcClient.jdbcInsert(item, connection);
@@ -454,7 +457,6 @@ public class MaterialRequisitionServiceImpl implements MaterialRequisitionServic
         for (MaterialRequisitionItem item : items) {
             item.setId(null);
             item.setRequisitionId(requisitionId);
-            item.setTenantId(tenantId);
             if (item.getActualQuantity() == null) {
                 item.setActualQuantity(BigDecimal.ZERO);
             }