From 10071356430697bcce24f8896cb606d0477781cd Mon Sep 17 00:00:00 2001 From: "XI_TENG\\xixi_" <971623072> Date: Mon, 3 Jun 2024 18:09:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=BB=98=E8=AE=A4=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=89=B9=E6=AC=A1=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProductWarehouseController.java | 1 + .../jnpf/controller/WorkOrderController.java | 6 ++++-- .../java/jnpf/entity/WorkOrderProductEntity.java | 4 ++++ .../model/workorder/WorkOrderProductModel.java | 4 ++++ .../jnpf-web/src/views/scm/workorder/form.vue | 16 ++++++++++++++++ 5 files changed, 29 insertions(+), 2 deletions(-) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java index 240ff872..c46f238d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/ProductWarehouseController.java @@ -194,6 +194,7 @@ public class ProductWarehouseController { entity.setProductTypeId(entity.getProductTypeIds()); entity.setInventoryUnitId(entity.getInventoryUnitIds()); entity.setProportionNum("0"); + entity.setBatchNumber("JG24000PZ"); Map productWarehouseMap=JsonUtil.entityToMap(entity); productWarehouseMap.put("id", productWarehouseMap.get("id")); //副表数据 diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java index 5abecd27..1c7c0d0b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java @@ -479,7 +479,8 @@ public class WorkOrderController { warehousingStorageProductModel.setDepartmentId( entity.getDepartmentId()); warehousingStorageProductModel.setCreatorUserId( entity.getCreatorUserId()); //入库新增一个批次号 - warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false)); +// warehousingStorageProductModel.setBatchNumber(generaterSwapUtil.getBillNumber("picihao", false)); + warehousingStorageProductModel.setBatchNumber(workOrderProductModel.getBatchNumber()); //成品批次 list.add(warehousingStorageProductModel); warehousingStorageForm.setWarehousingStorageProductList(list); } @@ -513,7 +514,8 @@ public class WorkOrderController { inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId()); inventoryEntity.setWarehouseId(entity.getWarehouseId()); inventoryEntity.setStorageAreaId(warehousingStorageProductModel.getStorageAreaId()); - inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber()); +// inventoryEntity.setBatchNumber(warehousingStorageProductModel.getBatchNumber()); + inventoryEntity.setBatchNumber(workOrderForm.getWorkOrderProductList().get(0).getBatchNumber()); //成品批次 inventoryEntity.setCompanyId( entity.getCompanyId()); inventoryEntity.setOrganizeJsonId(entity.getOrganizeJsonId()); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java index 2a882159..7cff6c15 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WorkOrderProductEntity.java @@ -70,6 +70,10 @@ public class WorkOrderProductEntity { @TableField(value = "BAR_CODE" , updateStrategy = FieldStrategy.IGNORED) private String barCode; + /** 批次号 **/ + @TableField(value = "BATCH_NUMBER" , updateStrategy = FieldStrategy.IGNORED) + private String batchNumber; + @TableField(exist = false) private BigDecimal nums; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java index 0db12163..9f92d3a3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/workorder/WorkOrderProductModel.java @@ -61,4 +61,8 @@ public class WorkOrderProductModel { @JsonProperty("creatorUserId") private String creatorUserId; + /** 批次号 **/ + @JSONField(name = "batchNumber") + private String batchNumber; + } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue index 30829a9b..eeec73cd 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/form.vue @@ -376,6 +376,20 @@ + + + + + @@ -760,6 +774,7 @@ export default { unitId: '', unitIdOptions: [], proportionNum: 0, + batchNumber: 'JG24000PZ', planNum: '', proportionNumOptions: [], bomId: '', @@ -1315,6 +1330,7 @@ export default { remark: undefined, spec: undefined, barCode: undefined, + batchNumber: 'JG24000PZ', inventoryUnitId: undefined, productTypeId: undefined, }