From f63d3156c6de124b73d240c5fe41b5dd99640506 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Tue, 14 May 2024 16:41:56 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form_data/service/dao/PmFormData.java | 7 ++++++- .../service/impl/PmFormDataServiceImpl.java | 2 +- .../SyncFormMappingController.java | 4 ++++ .../views/wms/base_manage/vehicle/index.vue | 4 +++- .../wms/sync_manage/form_mapping/index.vue | 19 ++++++++++++++++--- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java index a0a15dcb..252219d4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/PmFormData.java @@ -11,6 +11,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; +import org.nl.common.enums.StatusEnum; /** *

@@ -62,7 +63,7 @@ public class PmFormData implements Serializable { /** * 业务单据状态 */ - private String status; + private String status = StatusEnum.FORM_STATUS.code("生成"); /** * 创建id @@ -83,6 +84,10 @@ public class PmFormData implements Serializable { * 数量 */ private BigDecimal qty; + /** + * 分配数量 + */ + private BigDecimal assign_qty; /** * 数量 diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java index 53b123c7..177aa14a 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java @@ -112,7 +112,7 @@ public class PmFormDataServiceImpl extends ServiceImpl fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getUnit_id(), formStruc.getQty()); JSONObject data = fieldMapping(fields, fieldMapping, sourceData); - + data.put("form_type",formStruc.getForm_type()); JSONObject form_param = formStruc.getForm_param(); if (form_param!=null){ JSONObject form_data = fieldMapping(form_param.keySet(), fieldMapping, sourceData); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java index e04517bb..4b3e49b9 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/sync_manage/controller/form_mapping/SyncFormMappingController.java @@ -89,10 +89,14 @@ public class SyncFormMappingController { public ResponseEntity syncAnalyse(@RequestBody JSONObject form){ //参数判读，参数解析，调用参数入库 Object analyseData = form.remove("analyseData"); + Object needSave = form.remove("needSave"); if (analyseData == null){ throw new BadRequestException("解析数据不能为空"); } List pmFormDatas = formDataService.syncAnalyse(form.toJavaObject(SyncFormMapping.class), (String) analyseData); + if (needSave!=null && (Boolean)needSave){ + formDataService.saveBatch(pmFormDatas); + } return new ResponseEntity<>(TableDataInfo.build(pmFormDatas),HttpStatus.CREATED); } diff --git a/wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue b/wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue index 58dfed51..3f89f707 100644 --- a/wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue +++ b/wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue @@ -252,7 +252,9 @@ - + + +