From 6d4e264b3b9b0b45a35168931136f56acd2ff792 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 20 Nov 2024 13:24:00 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9dtlSplit=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/constant/DictConstantPool.java | 4 +- .../form_struc/service/dao/BmFormStruc.java | 10 +- .../iostorage/PdaOutController.java | 8 +- .../controller/PmFormDataController.java | 2 - .../form_data/service/dao/PmFormData.java | 6 +- .../dao/mapper/xml/PmFormDataMapper.xml | 2 + .../form_data/service/dto/PmFormDataDto.java | 6 +- .../service/impl/PmFormDataServiceImpl.java | 5 +- wms_pro/qd/src/views/login.vue | 2 +- .../wms/config_manage/formStruc/index.vue | 120 ++++++++++-------- 10 files changed, 100 insertions(+), 65 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java index 97088292..00c44838 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/common/domain/constant/DictConstantPool.java @@ -24,7 +24,9 @@ public class DictConstantPool { ,"biz_status","业务单据状态" ,"biz_form_type","业务单据类型" ,"material_id","物料id" - ,"qty","数量" + ,"qty","申请数量" + ,"plan_qty","计划数量" + ,"assign_qty","已领数量" ,"unit_id","单位" ,"pcsn","批次" ,"vehicle_code","载具"); diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java index d3081298..dcc697a1 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/config_manage/form_struc/service/dao/BmFormStruc.java @@ -98,10 +98,18 @@ public class BmFormStruc implements Serializable { private String vehicle_id; /** - * 数量 + * 申请数量（必须有） */ private String qty; + /** + * 计划数量 + */ + private String plan_qty; + /** + * 已领取数量 + */ + private String assign_qty; /** * 单位id */ diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java index d91b9a4e..f66be632 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/PdaOutController.java @@ -7,6 +7,7 @@ import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.entity.PageQuery; import org.nl.common.enums.StatusEnum; +import org.nl.common.utils.MapOf; import org.nl.wms.config_manage.form_struc.service.IBmFormStrucService; import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc; import org.nl.wms.flow_manage.flow.service.execution.IActRuExecutionService; @@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** *

@@ -49,13 +51,13 @@ public class PdaOutController { @GetMapping("order") @Log("出库单据列表") @SaIgnore - public ResponseEntity> orderType() { - List result = new ArrayList<>(); + public ResponseEntity> orderType() { + List result = new ArrayList<>(); List list = iBmFormStrucService.list(new QueryWrapper() .likeRight("form_desc","出库") .select("form_type","form_name")); for (BmFormStruc formStruc : list) { - result.add(new LabelValueVo(formStruc.getForm_name(), formStruc.getForm_type())); + result.add(MapOf.of("text",formStruc.getForm_name(),"value",formStruc.getForm_type())); } return new ResponseEntity<>(result,HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java index 25ecf920..a438b911 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java @@ -37,8 +37,6 @@ public class PmFormDataController { @GetMapping() @Log("查询数据") public ResponseEntity queryAll(FormDataQuery query, PageQuery page) { - - return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK); } 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 345ccb25..a3742dd6 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 @@ -78,7 +78,11 @@ public class PmFormData implements Serializable { */ private BigDecimal qty; /** - * 分配数量 + * 数量 + */ + private BigDecimal plan_qty; + /** + * 已分配数量 */ private BigDecimal assign_qty; diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml index 5c7630e9..e87bf3cb 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dao/mapper/xml/PmFormDataMapper.xml @@ -36,6 +36,8 @@ + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java index fd0075d0..6c88a289 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/dto/PmFormDataDto.java @@ -104,7 +104,11 @@ public class PmFormDataDto implements Serializable { */ private BigDecimal qty; /** - * 分配数量 + * 数量 + */ + private BigDecimal plan_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 822bb669..cef1364a 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 @@ -128,7 +128,6 @@ public class PmFormDataServiceImpl extends ServiceImpl queryTree(FormDataQuery query, PageQuery pageQuery) { - Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize()); + Page page = PageHelper.startPage(pageQuery.getPage()+1, pageQuery.getSize()); page.setOrderBy("id DESC"); List pmFormDataDtos = this.baseMapper.queryTree(query); com.baomidou.mybatisplus.extension.plugins.pagination.Page dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal()); @@ -232,7 +231,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.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty()); + Set fields = ListOf.ofSet(formStruc.getBiz_code(), formStruc.getBiz_id(), formStruc.getBiz_code(), formStruc.getBiz_status(), formStruc.getMaterial_id(), formStruc.getPcsn(), formStruc.getVehicle_code(), formStruc.getVehicle_id(),formStruc.getUnit_id(), formStruc.getQty(),formStruc.getPlan_qty(),formStruc.getAssign_qty()); JSONObject data = fieldMapping(fields, fieldMapping, sourceData); data.put("form_type",formStruc.getForm_type()); diff --git a/wms_pro/qd/src/views/login.vue b/wms_pro/qd/src/views/login.vue index 90a02af9..03afd721 100644 --- a/wms_pro/qd/src/views/login.vue +++ b/wms_pro/qd/src/views/login.vue @@ -2,7 +2,7 @@ - - + - + - + - + - + @@ -90,8 +90,8 @@ - 是 - 否 + 是 + 否 @@ -100,74 +100,86 @@ - 是 - 否 + 是 + 否 - + - + - + - + - + - + - - + + + + + + + + + + + + + + - + - + - + - +
@@ -186,26 +198,28 @@ row-key="form_type" table-layout="auto" > - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - +
- + @@ -255,6 +269,8 @@ const defaultForm = { biz_form_type: null, material_id: null, qty: null, + plan_qty: null, + assign_qty: null, pcsn: null, vehicle_code: null, form_param: null, @@ -268,7 +284,7 @@ export default { name: 'FormStruc', dicts: ['base_data'], components: { UploadDialog, pagination, crudOperation, rrOperation, udOperation, Treeselect }, - mixins: [ presenter(), header(), form(defaultForm), crud() ], + mixins: [presenter(), header(), form(defaultForm), crud()], cruds() { return CRUD({ title: '自定义表单', @@ -290,10 +306,10 @@ export default { permission: {}, rules: { form_type: [ - {required: true, message: '表单类型不能为空', trigger: 'blur'} + { required: true, message: '表单类型不能为空', trigger: 'blur' } ], form_name: [ - {required: true, message: '表单名称不能为空', trigger: 'blur'} + { required: true, message: '表单名称不能为空', trigger: 'blur' } ] } } @@ -310,7 +326,7 @@ export default { return true }, [CRUD.HOOK.beforeSubmit]() { - if (this.form.form_param){ + if (this.form.form_param) { this.form.form_param = JSON.parse(this.form.form_param) } return true @@ -326,7 +342,7 @@ export default { }, 100) }, booleanFormat(row, column, cellValue) { - return cellValue ? '是' : '否'; + return cellValue ? '是' : '否' }, jsonFormat(row, index) { if (row.form_param != null) {