From fc545bdd4023abcba7002bcab88c66306ca39c5b Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 31 May 2024 13:17:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?add:=E5=91=86=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hd/.idea/sonarlint/issuestore/index.pb | 88 ++++++- .../AlmEarlyDeferralController.java | 116 +++++++++ .../AlmEarlyDeferralDetailController.java | 22 ++ .../notification/EmailNotification.java | 17 ++ .../notification/Notification.java | 11 + .../notification/NotificationFactory.java | 19 ++ .../notification/WeChatNotification.java | 18 ++ .../IAlmEarlyDeferralDetailService.java | 16 ++ .../IAlmEarlyDeferralService.java | 17 ++ .../early_deferral/dao/AlmEarlyDeferral.java | 44 ++++ .../dao/AlmEarlyDeferralDetail.java | 29 +++ .../mapper/AlmEarlyDeferralDetailMapper.java | 16 ++ .../dao/mapper/AlmEarlyDeferralMapper.java | 16 ++ .../xml/AlmEarlyDeferralDetailMapper.xml | 5 + .../dao/mapper/xml/AlmEarlyDeferralMapper.xml | 5 + .../early_deferral/dto/AlmDeferralQuery.java | 26 ++ .../AlmEarlyDeferralDetailServiceImpl.java | 20 ++ .../impl/AlmEarlyDeferralServiceImpl.java | 21 ++ .../service/listen/EarlyEventListener.java | 3 +- .../tasks/AutoDeferralNotice.java | 74 ++++++ .../deferral_early/EditDialog.vue | 199 +++++++++++++++ .../deferral_early/MaterialDtl.vue | 165 ++++++++++++ .../deferral_early/UploadDialog.vue | 2 +- .../deferral_early/ViewDialog.vue | 147 +++++++++++ .../deferral_early/deferral_early.js | 42 +++ .../early_manage/deferral_early/formstruc.js | 35 --- .../wms/early_manage/deferral_early/index.vue | 241 +++++++++--------- .../views/wms/pm_manage/form_data/index.vue | 2 +- 28 files changed, 1249 insertions(+), 167 deletions(-) create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java create mode 100644 wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java create mode 100644 wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue create mode 100644 wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue create mode 100644 wms_pro/qd/src/views/wms/early_manage/deferral_early/ViewDialog.vue create mode 100644 wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js delete mode 100644 wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb index b2f499c5..052fe284 100644 --- a/wms_pro/hd/.idea/sonarlint/issuestore/index.pb +++ b/wms_pro/hd/.idea/sonarlint/issuestore/index.pb @@ -147,14 +147,10 @@ fnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper ]nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/IMdGruopDickService.java,2/1/21151f545e109906fa59e7b7b0154d60b7c5a908 Œ \nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java,4/9/496d3ff8da16d905d8db54d3a8b7f523ee06f40f -’ -bnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java,2/b/2bf79ab59317d0d6b177fe4f01b5d69517e7c0bd • enladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java,d/5/d5175090d4638102781aaeb7ed369c4622e8f70e ‹ [nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java,0/e/0e3d3e1c71243632b0cf4d4ce5d42bab41cbcbe2 -“ -cnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java,d/2/d20e36ad1812a5acaa116fa022508a7ca0cc28fa  `nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java,c/4/c4b778bf4651d57a395e7eb2a9bcc835c076436d ¢ @@ -219,8 +215,6 @@ hnladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/S _nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/IStIvtStructattrService.java,b/1/b10dff3efd70a39f23a25125ca4669d404c03bbb › knladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml,d/3/d3143bfeb3b1a633f41056e1c3d660d3ac2e1b14 -u -Enladmin-system/src/main/java/org/nl/config/mybatis/CodeGenerator.java,d/a/da94e2f9402ad75ef272f2e95148c573aee9a1ff ‰ Ynladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/dao/SchBaseTask.java,4/a/4a2188ff934d5838c3361cc66d54b717f4ae8b43 p @@ -246,4 +240,84 @@ bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBase ’ bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java,c/a/caa59130099a147acf733a484dae55badb122e24  -`nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java,f/4/f4d6da57d25a0f0b8fd7caeadffca82408ea455b \ No newline at end of file +`nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java,f/4/f4d6da57d25a0f0b8fd7caeadffca82408ea455b +‘ +anladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java,8/9/89eeb13258719f34694cb541337f127c3bcaeda1 +‹ +[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_dtl/dto/AlmDtlQuery.java,f/5/f577be680457cd515c39a9bdb42962876f3a797e + +_nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_dtl/IAlmEarlyDtlService.java,c/f/cfb3f3d43fb51cabdf88475ac21467464663d4d2 +‹ +[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_dtl/dao/AlmEarlyDtl.java,a/e/ae7de5382f386b31850c7bebbaafd2ee7d982bdb +‹ +[nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java,4/0/400fbf00a1743bc1972994d7dffce150f50044f7 +  +pnladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/controller/StIvtBsrealstorattrController.java,d/0/d0db99e1b09f3f2138d67b32b09a790fab389d52 +› +knladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/IStIvtBsrealstorattrService.java,b/6/b6652cb9485ab5c616512c5b1596c8938231ce4d +£ +snladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/impl/StIvtBsrealstorattrServiceImpl.java,4/6/46f585b55f9b2b80abd40f64aae4d929de754b07 +¤ +tnladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/StIvtBsrealstorattrMapper.java,8/d/8dab5749445e6bd915d23a28eb8e4a050c0ee04b +§ +wnladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/xml/StIvtBsrealstorattrMapper.xml,4/d/4d3e1f8ec363f936f590908e997cec63d4e3bd17 +ž +nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09 +‹ +[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dto/AlmMsgQuery.java,8/c/8c7ec5d7459e7ed0dc10a7f4f76f2a2d40f8240d +“ +cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854 +‹ +[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/dto/AlmInvQuery.java,a/c/ac795ed3f5d9af374a251274b3fb217c757ed16f +‡ +Wnladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java,9/f/9fe2b6a548ba1008141ed40460ec4d82395db0a4 +” +dnladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java,e/d/ed4f61ccea3d38d63cf8de22ea788a557b8715b9 +– +fnladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/out/StIvtIostorinvOutController.java,8/9/893a4d2aa05eceb25d834bf47e23e48568d02466 +’ +bnladmin-system/src/main/java/org/nl/wms/decision_manage/handler/impl/base/AlleyAveRuleHandler.java,1/7/17f3df7bf2246754fbd6d226ec564d29c55c7f66 + +Onladmin-system/src/main/java/org/nl/wms/decision_manage/handler/Decisioner.java,a/3/a361deae2fc9bf3e2f6edd94a357948051baf7c6 +’ +bnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java,2/b/2bf79ab59317d0d6b177fe4f01b5d69517e7c0bd + +_nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/IAlmEarlyInvService.java,f/3/f3f3536e2922d86604423471c2a52e7dded2361d +— +gnladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/impl/AlmEarlyInvServiceImpl.java,d/3/d3dd85054b9911b6e121d28c55285b1ce5fa5f42 +‹ +[nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/entity/ExecutionDto.java,2/4/242d9c8eb28dd21d1402453ba355f6ec40fdc788 +z +Jnladmin-system/src/main/java/org/nl/common/publish/event/PublishEvent.java,8/a/8abfe091a902bf08c896a3faf689f781e7f33073 +‹ +[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/dao/AlmEarlyInv.java,a/2/a2dc43bb714a304539d1b763f248ab450efbc0c4 +… +Unladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/StructEvent.java,e/1/e1d33ffe0ba3ba46083458031b7c33e86c52d311 +x +Hnladmin-system/src/main/java/org/nl/common/publish/AbstraceListener.java,b/3/b3bfec6326ccb8d8ae531fa8ec18b603c601229a +  +pnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java,0/6/066ec6b83ae42a40454c31c59c5d269ee1dc3d65 +¦ +vnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java,c/0/c0b659d2615c5215dbc794369f9caa35a62a208f +ž +nnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java,7/c/7cc3508f6ed0218b667780c6253629cad56fae40 +§ +wnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java,f/1/f1f9af132b1fbfcbaa203f0c2ef78f302672c13e +¥ +unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java,4/6/468b8890e22da422beef66f1ceb2f42ad599595a +Ž +^nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java,7/a/7adab1dfdd514fffb1b5bd7e8185ce2199e90baf +ƒ +Snladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowEndEvent.java,3/f/3fcd5ea3f30a701761063bc6a74a6e4184ce8aaf +” +dnladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java,b/b/bbc6aea0ca4c5586df592d4f6881443398ec92d2 +› +knladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/xml/AlmEarlyMsgMapper.xml,a/0/a085d8991a3b8d868dc65e6b249925c758570ca8 +‚ +Rnladmin-system/src/main/java/org/nl/wms/early_manage/service/event/EarlyEvent.java,a/8/a8743481ee60617190189fadcfc1485c8a485e83 +y +Inladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java,9/0/907e26f855afcf912a10f1d2879ec6b2523a6ef2 +— +gnladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java,4/c/4c0760c22498b67051d98696e64a0debbe4c97da +£ +snladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java,f/e/fe3bd455dd5beee3dffeaf38da059cdedffdfc25 \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java new file mode 100644 index 00000000..802ab500 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralController.java @@ -0,0 +1,116 @@ +package org.nl.wms.early_manage.controller.early_deferral; + + +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.nl.common.TableDataInfo; +import org.nl.common.domain.entity.PageQuery; +import org.nl.common.utils.IdUtil; +import org.nl.common.utils.SecurityUtils; +import org.nl.wms.base_manage.material.service.IMdMeMaterialbaseService; +import org.nl.wms.base_manage.material.service.dao.MdMeMaterialbase; +import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralDetailService; +import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralService; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail; +import org.nl.wms.early_manage.service.early_deferral.dto.AlmDeferralQuery; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.Arrays; +import java.util.List; + +/** + *

+ * å‰ç«¯æŽ§åˆ¶å™¨ + *

+ * + * @author generator + * @since 2024-05-31 + */ +@RestController +@RequestMapping("/api/almEarlyDeferral") +public class AlmEarlyDeferralController { + + @Autowired + private IAlmEarlyDeferralService almEarlyDeferralService; + @Autowired + private IAlmEarlyDeferralDetailService almEarlyDeferralDetailService; + @Autowired + private IMdMeMaterialbaseService materialbaseService; + + @GetMapping + public ResponseEntity getAll(AlmDeferralQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(almEarlyDeferralService.page(page.build(), query.build())), HttpStatus.OK); + } + + @GetMapping("/dtl/{id}") + public ResponseEntity getDtl(@PathVariable String id) { + List list = almEarlyDeferralDetailService.list(new LambdaQueryWrapper().eq(AlmEarlyDeferralDetail::getDeferral_id, id)); + JSONArray array = new JSONArray(); + for (AlmEarlyDeferralDetail detail : list) { + JSONObject jsonObject = new JSONObject(); + jsonObject.put("deferral_id", detail.getDeferral_id()); + jsonObject.put("material_id", detail.getMaterial_id()); + MdMeMaterialbase materialbase = materialbaseService.getById(detail.getMaterial_id()); + jsonObject.put("material_code", materialbase.getMaterial_code()); + jsonObject.put("material_name", materialbase.getMaterial_name()); + jsonObject.put("material_spec", materialbase.getMaterial_spec()); + jsonObject.put("material_model", materialbase.getMaterial_model()); + array.add(jsonObject); + } + return new ResponseEntity<>(array, HttpStatus.OK); + } + + @PostMapping("/saveDtl") + public ResponseEntity saveDtl(@Validated @RequestBody JSONObject dto) { + String id = dto.getString("id"); + LambdaUpdateWrapper luw = new LambdaUpdateWrapper<>(); + luw.eq(AlmEarlyDeferralDetail::getDetail_id, id); + almEarlyDeferralDetailService.remove(luw); + JSONArray jsonArray = dto.getJSONArray("tableData"); + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject jsonObject = jsonArray.getJSONObject(i); + String material_id = jsonObject.getString("material_id"); + AlmEarlyDeferralDetail almEarlyDeferralDetail = new AlmEarlyDeferralDetail(); + almEarlyDeferralDetail.setDetail_id(IdUtil.getStringId()); + almEarlyDeferralDetail.setDeferral_id(id); + almEarlyDeferralDetail.setMaterial_id(material_id); + almEarlyDeferralDetailService.save(almEarlyDeferralDetail); + } + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @DeleteMapping("/delete") + public ResponseEntity delete(@RequestBody String[] ids) { + if (ids.length > 0) { + almEarlyDeferralService.removeByIds(Arrays.asList(ids)); + } + return new ResponseEntity<>(HttpStatus.OK); + } + + @PostMapping + public ResponseEntity create(@Validated @RequestBody JSONObject dto) { + AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class); + almEarlyDeferral.setCreate_name(SecurityUtils.getCurrentNickName()); + almEarlyDeferral.setId(IdUtil.getStringId()); + almEarlyDeferral.setCreate_time(DateUtil.now()); + almEarlyDeferralService.save(almEarlyDeferral); + return new ResponseEntity<>(HttpStatus.CREATED); + } + + @PostMapping("/update") + public ResponseEntity update(@Validated @RequestBody JSONObject dto) { + AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class); + almEarlyDeferral.setCreate_time(DateUtil.now()); + almEarlyDeferralService.updateById(almEarlyDeferral); + return new ResponseEntity<>(HttpStatus.CREATED); + } +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java new file mode 100644 index 00000000..84cf554c --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_deferral/AlmEarlyDeferralDetailController.java @@ -0,0 +1,22 @@ +package org.nl.wms.early_manage.controller.early_deferral; + + + +import org.springframework.web.bind.annotation.RequestMapping; + +import org.springframework.web.bind.annotation.RestController; + +/** + *

+ * å‰ç«¯æŽ§åˆ¶å™¨ + *

+ * + * @author generator + * @since 2024-05-31 + */ +@RestController +@RequestMapping("/api/almEarlyDeferralDetail") +public class AlmEarlyDeferralDetailController { + +} + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java new file mode 100644 index 00000000..d2809656 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/EmailNotification.java @@ -0,0 +1,17 @@ +package org.nl.wms.early_manage.notification; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/5/31 + */ +public class EmailNotification extends Notification { + + public EmailNotification() { + } + + @Override + public void send(String message) { + System.out.println("å‘é€é‚®ä»¶å†…容：" + message); + } +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java new file mode 100644 index 00000000..713c6792 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/Notification.java @@ -0,0 +1,11 @@ +package org.nl.wms.early_manage.notification; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/5/31 + */ +public abstract class Notification { + + public abstract void send(String message); +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java new file mode 100644 index 00000000..7797ae85 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/NotificationFactory.java @@ -0,0 +1,19 @@ +package org.nl.wms.early_manage.notification; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/5/31 + */ +public class NotificationFactory { + public static Notification getNotification(String noticeType) { + switch (noticeType) { + case "1": + return new EmailNotification(); + case "2": + return new WeChatNotification(); + default: + throw new IllegalArgumentException("未知的通知类型: " + noticeType); + } + } +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java new file mode 100644 index 00000000..2c144d87 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/notification/WeChatNotification.java @@ -0,0 +1,18 @@ +package org.nl.wms.early_manage.notification; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/5/31 + */ +public class WeChatNotification extends Notification { + + + public WeChatNotification() { + } + + @Override + public void send(String message) { + System.out.println("å‘é€å¾®ä¿¡å†…容：" + message); + } +} \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java new file mode 100644 index 00000000..e3d88092 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralDetailService.java @@ -0,0 +1,16 @@ +package org.nl.wms.early_manage.service.early_deferral; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail; + +/** + *

+ * æœåŠ¡ç±» + *

+ * + * @author generator + * @since 2024-05-31 + */ +public interface IAlmEarlyDeferralDetailService extends IService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java new file mode 100644 index 00000000..67b24070 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/IAlmEarlyDeferralService.java @@ -0,0 +1,17 @@ +package org.nl.wms.early_manage.service.early_deferral; + + +import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral; + +/** + *

+ * æœåŠ¡ç±» + *

+ * + * @author generator + * @since 2024-05-31 + */ +public interface IAlmEarlyDeferralService extends IService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java new file mode 100644 index 00000000..39821b1d --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferral.java @@ -0,0 +1,44 @@ +package org.nl.wms.early_manage.service.early_deferral.dao; + +import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author generator + * @since 2024-05-31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("alm_early_deferral") +public class AlmEarlyDeferral implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + + private String alm_name; + + private String stor_code; + + private Integer stay_days; + + private String notice_type; + + private String ext_json; + + private Boolean is_used; + + private String remark; + + private String create_name; + + private String create_time; +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java new file mode 100644 index 00000000..0ca2d594 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/AlmEarlyDeferralDetail.java @@ -0,0 +1,29 @@ +package org.nl.wms.early_manage.service.early_deferral.dao; + + +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + *

+ * + *

+ * + * @author generator + * @since 2024-05-31 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@TableName("alm_early_deferral_detail") +public class AlmEarlyDeferralDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + private String detail_id; + + private String deferral_id; + + private String material_id; +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java new file mode 100644 index 00000000..2e85b254 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralDetailMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.early_manage.service.early_deferral.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail; + +/** + *

+ * Mapper æŽ¥å£ + *

+ * + * @author generator + * @since 2024-05-31 + */ +public interface AlmEarlyDeferralDetailMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java new file mode 100644 index 00000000..6421f8e0 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/AlmEarlyDeferralMapper.java @@ -0,0 +1,16 @@ +package org.nl.wms.early_manage.service.early_deferral.dao.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral; + +/** + *

+ * Mapper æŽ¥å£ + *

+ * + * @author generator + * @since 2024-05-31 + */ +public interface AlmEarlyDeferralMapper extends BaseMapper { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml new file mode 100644 index 00000000..460d4603 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralDetailMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml new file mode 100644 index 00000000..cfa49e34 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dao/mapper/xml/AlmEarlyDeferralMapper.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java new file mode 100644 index 00000000..3f58f078 --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/dto/AlmDeferralQuery.java @@ -0,0 +1,26 @@ +package org.nl.wms.early_manage.service.early_deferral.dto; + +import lombok.Data; +import org.nl.common.domain.entity.BaseQuery; +import org.nl.common.domain.entity.QParam; +import org.nl.common.enums.QueryTEnum; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral; + +/* + * @author ZZQ + * @Date 2023/5/4 19:49 + */ +@Data +public class AlmDeferralQuery extends BaseQuery { + + private String search; + private String stor_code; + + @Override + public void paramMapping() { + super.doP.put("search", QParam.builder().k(new String[]{"alm_name"}).type(QueryTEnum.LK).build()); + super.doP.put("stor_code", QParam.builder().k(new String[]{"stor_code"}).type(QueryTEnum.EQ).build()); + } + + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java new file mode 100644 index 00000000..63cca67f --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralDetailServiceImpl.java @@ -0,0 +1,20 @@ +package org.nl.wms.early_manage.service.early_deferral.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralDetailService; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail; +import org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralDetailMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * æœåŠ¡å®žçŽ°ç±» + *

+ * + * @author generator + * @since 2024-05-31 + */ +@Service +public class AlmEarlyDeferralDetailServiceImpl extends ServiceImpl implements IAlmEarlyDeferralDetailService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java new file mode 100644 index 00000000..29dafedf --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_deferral/impl/AlmEarlyDeferralServiceImpl.java @@ -0,0 +1,21 @@ +package org.nl.wms.early_manage.service.early_deferral.impl; + + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralService; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral; +import org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralMapper; +import org.springframework.stereotype.Service; + +/** + *

+ * æœåŠ¡å®žçŽ°ç±» + *

+ * + * @author generator + * @since 2024-05-31 + */ +@Service +public class AlmEarlyDeferralServiceImpl extends ServiceImpl implements IAlmEarlyDeferralService { + +} diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java index 40a23d18..d92fc733 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/service/listen/EarlyEventListener.java @@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.publish.AbstraceListener; import org.nl.common.utils.IdUtil; import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.early_manage.notification.NotificationFactory; import org.nl.wms.early_manage.service.early_dtl.IAlmEarlyDtlService; import org.nl.wms.early_manage.service.early_dtl.dao.AlmEarlyDtl; import org.nl.wms.early_manage.service.early_inv.IAlmEarlyInvService; @@ -62,7 +63,7 @@ public class EarlyEventListener extends AbstraceListener { almEarlyMsg.setStor_code(earlyInv.getStor_code()); almEarlyMsgService.save(almEarlyMsg); //æ ¹æ®notice_type下å‘通知 - System.out.println("下å‘通知"); + NotificationFactory.getNotification(notice_type).send(""); } } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java new file mode 100644 index 00000000..14ecd90e --- /dev/null +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/early_manage/tasks/AutoDeferralNotice.java @@ -0,0 +1,74 @@ +package org.nl.wms.early_manage.tasks; + +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import org.nl.common.utils.IdUtil; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.IMdPbVehicleMaterService; +import org.nl.wms.base_manage.vehicle.vehicleMater.service.dao.MdPbVehicleMater; +import org.nl.wms.early_manage.notification.NotificationFactory; +import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralDetailService; +import org.nl.wms.early_manage.service.early_deferral.IAlmEarlyDeferralService; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferral; +import org.nl.wms.early_manage.service.early_deferral.dao.AlmEarlyDeferralDetail; +import org.nl.wms.early_manage.service.early_msg.IAlmEarlyMsgService; +import org.nl.wms.early_manage.service.early_msg.dao.AlmEarlyMsg; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; +import java.util.stream.Collectors; + +/** + * @Description TODO + * @Author Gengby + * @Date 2024/5/31 + */ +@Component +public class AutoDeferralNotice { + + @Autowired + private IAlmEarlyDeferralService almEarlyDeferralService; + @Autowired + private IAlmEarlyDeferralDetailService almEarlyDeferralDetailService; + @Autowired + private IMdPbVehicleMaterService mdPbVehicleMaterService; + @Autowired + private IAlmEarlyMsgService almEarlyMsgService; + + public void run() { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(AlmEarlyDeferral::getIs_used, "1"); + List list = almEarlyDeferralService.list(lambdaQueryWrapper); + for (AlmEarlyDeferral almEarlyDeferral : list) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(AlmEarlyDeferralDetail::getDeferral_id, almEarlyDeferral.getId()); + List deferralDetails = almEarlyDeferralDetailService.list(lqw); + List materialIds = deferralDetails.stream() + .map(detail -> detail.getMaterial_id()) + .collect(Collectors.toList()); + LambdaQueryWrapper mdPbVehicleMaterLambdaQueryWrapper = new LambdaQueryWrapper<>(); + mdPbVehicleMaterLambdaQueryWrapper.in(MdPbVehicleMater::getMaterial_id, materialIds); + List mdPbVehicleMaters = mdPbVehicleMaterService.list(mdPbVehicleMaterLambdaQueryWrapper); + List filteredMdPbVehicleMaters = mdPbVehicleMaters.stream() + .filter(mater -> { + long daysBetween = DateUtil.betweenDay(DateUtil.parse(mater.getUpdate_time()), DateUtil.parse(DateUtil.now()), true); + return daysBetween > almEarlyDeferral.getStay_days(); + }) + .collect(Collectors.toList()); + for (MdPbVehicleMater filteredMdPbVehicleMater : filteredMdPbVehicleMaters) { + AlmEarlyMsg almEarlyMsg = new AlmEarlyMsg(); + almEarlyMsg.setId(IdUtil.getStringId()); + almEarlyMsg.setEarly_type("2"); + almEarlyMsg.setStor_code(almEarlyDeferral.getStor_code()); + almEarlyMsg.setMaterial_id(filteredMdPbVehicleMater.getMaterial_id()); + almEarlyMsg.setCreate_time(DateUtil.now()); + almEarlyMsg.setQty(filteredMdPbVehicleMater.getQty().intValue()); + almEarlyMsg.setCreate_time(DateUtil.now()); + almEarlyMsg.setVehicle_code(filteredMdPbVehicleMater.getVehicle_code()); + almEarlyMsg.setPcsn(filteredMdPbVehicleMater.getPcsn()); + almEarlyMsgService.save(almEarlyMsg); + NotificationFactory.getNotification(almEarlyDeferral.getNotice_type()).send(""); + } + } + } +} \ No newline at end of file diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue new file mode 100644 index 00000000..b3318560 --- /dev/null +++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/EditDialog.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue new file mode 100644 index 00000000..3a600d5c --- /dev/null +++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/MaterialDtl.vue @@ -0,0 +1,165 @@ + + + + diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue index eb9cfcde..dd858a6b 100644 --- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue +++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/UploadDialog.vue @@ -38,7 +38,7 @@ + + diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js b/wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js new file mode 100644 index 00000000..f205943d --- /dev/null +++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/deferral_early.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' + +export function add(data) { + return request({ + url: 'api/almEarlyDeferral', + method: 'post', + data + }) +} + +export function del(ids) { + return request({ + url: 'api/almEarlyDeferral/delete', + method: 'get', + data: ids + }) +} + +export function edit(data) { + return request({ + url: 'api/almEarlyDeferral/update', + method: 'post', + data + }) +} + +export function getDtl(id) { + return request({ + url: 'api/almEarlyDeferral/dtl/' + id, + method: 'get', + }) +} + +export function saveDtl(data) { + return request({ + url: 'api/almEarlyDeferral/saveDtl', + method: 'post', + data + }) +} + +export default { add, edit, del, getDtl, saveDtl} diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js b/wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js deleted file mode 100644 index 3f6d1330..00000000 --- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/formstruc.js +++ /dev/null @@ -1,35 +0,0 @@ -import request from '@/utils/request' - -export function add(data) { - return request({ - url: 'api/bmFormStruc', - method: 'post', - data - }) -} - -export function del(ids) { - return request({ - url: 'api/bmFormStruc/delete', - method: 'get', - data: ids - }) -} - -export function edit(data) { - return request({ - url: 'api/bmFormStruc/update', - method: 'post', - data - }) -} - -export function getTypes(params) { - return request({ - url: 'api/bmFormStruc/getTypes', - method: 'get', - params - }) -} - -export default { add, edit, del, getTypes} diff --git a/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue b/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue index 9f2d1212..8412d8b0 100644 --- a/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue +++ b/wms_pro/qd/src/views/wms/early_manage/deferral_early/index.vue @@ -11,9 +11,12 @@ label-width="90px" label-suffix=":" > - + + + + + v-for="item in storList" + :key="item.stor_id" + :label="item.stor_code" + :value="item.stor_code"> - + + + 修改明细 + - + - - - + + + - - - + + + + + + - - - + + + + 站内信 + 微信 + - - - - - + + + 是 å¦ - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - -
å–消 @@ -139,33 +126,31 @@ ref="table" v-loading="crud.loading" lazy - :load="getClassDatas" - :tree-props="{children: 'children', hasChildren: 'hasChildren'}" :data="crud.data" row-key="id" @select="crud.selectChange" @select-all="crud.selectAllChange" @selection-change="crud.selectionChangeHandler" > - - - - - - - - - - - - - - - + + + + + + + + + + + + - +
+ + diff --git a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue index 1b9bacb7..ff6adc85 100644 --- a/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue +++ b/wms_pro/qd/src/views/wms/pm_manage/form_data/index.vue @@ -108,11 +108,11 @@ + - Date: Tue, 4 Jun 2024 09:22:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E5=9F=BA=E7=A1=80=E8=A1=A8=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wms_pro/hd/.idea/jarRepositories.xml | 8 +- wms_pro/hd/.idea/misc.xml | 3 + .../execution/ExecutionController.java | 2 +- .../dao/mapper/ActHiExecutionMapper.java | 11 +- .../dao/mapper/xml/ActHiExecutionMapper.xml | 11 +- .../form_data/service/IPmFormDataService.java | 6 +- .../service/impl/PmFormDataServiceImpl.java | 10 +- .../BmExternalFieldMappingController.java | 27 +++- .../IBmExternalFieldMappingService.java | 10 ++ .../mapper/BmExternalFieldMappingMapper.java | 19 ++- .../xml/BmExternalFieldMappingMapper.xml | 13 +- .../service/field_mapping/dto/MappingDto.java | 1 + .../BmExternalFieldMappingServiceImpl.java | 116 +++++++++++++++--- .../sync_manage/field_mapping/fieldMapping.js | 26 +++- .../wms/sync_manage/field_mapping/index.vue | 81 +++++++++++- 15 files changed, 307 insertions(+), 37 deletions(-) diff --git a/wms_pro/hd/.idea/jarRepositories.xml b/wms_pro/hd/.idea/jarRepositories.xml index a905a6d1..b7093a6b 100644 --- a/wms_pro/hd/.idea/jarRepositories.xml +++ b/wms_pro/hd/.idea/jarRepositories.xml @@ -8,13 +8,13 @@