add:呆料

2024-05-31 13:17:57 +08:00
parent e446f8b743
commit fc545bdd40
28 changed files with 1249 additions and 167 deletions
--- 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
 <EFBFBD>
 \nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dto/GroupDickQuery.java,4/9/496d3ff8da16d905d8db54d3a8b7f523ee06f40f
-<EFBFBD>
-bnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java,2/b/2bf79ab59317d0d6b177fe4f01b5d69517e7c0bd
 <EFBFBD>
 enladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/impl/MdGruopDickServiceImpl.java,d/5/d5175090d4638102781aaeb7ed369c4622e8f70e
 <EFBFBD>
 [nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java,0/e/0e3d3e1c71243632b0cf4d4ce5d42bab41cbcbe2
-<EFBFBD>
-cnladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java,d/2/d20e36ad1812a5acaa116fa022508a7ca0cc28fa
 <EFBFBD>
 `nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java,c/4/c4b778bf4651d57a395e7eb2a9bcc835c076436d
 <EFBFBD>
@@ -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
 <EFBFBD>
 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
 <EFBFBD>
 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
 <EFBFBD>
 bnladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/StackingTaskHandler.java,c/a/caa59130099a147acf733a484dae55badb122e24
 <EFBFBD>
-`nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java,f/4/f4d6da57d25a0f0b8fd7caeadffca82408ea455b
+`nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/handler/impl/TaskStatusHandler.java,f/4/f4d6da57d25a0f0b8fd7caeadffca82408ea455b
+<EFBFBD>
+anladmin-system/src/main/java/org/nl/wms/base_manage/material/controller/BmMaterialController.java,8/9/89eeb13258719f34694cb541337f127c3bcaeda1
+<EFBFBD>
+[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_dtl/dto/AlmDtlQuery.java,f/5/f577be680457cd515c39a9bdb42962876f3a797e
+<EFBFBD>
+_nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_dtl/IAlmEarlyDtlService.java,c/f/cfb3f3d43fb51cabdf88475ac21467464663d4d2
+<EFBFBD>
+[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_dtl/dao/AlmEarlyDtl.java,a/e/ae7de5382f386b31850c7bebbaafd2ee7d982bdb
+<EFBFBD>
+[nladmin-system/src/main/java/org/nl/wms/base_manage/material/service/dto/MaterialQuery.java,4/0/400fbf00a1743bc1972994d7dffce150f50044f7
+<EFBFBD>
+pnladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/controller/StIvtBsrealstorattrController.java,d/0/d0db99e1b09f3f2138d67b32b09a790fab389d52
+<EFBFBD>
+knladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/IStIvtBsrealstorattrService.java,b/6/b6652cb9485ab5c616512c5b1596c8938231ce4d
+<EFBFBD>
+snladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/impl/StIvtBsrealstorattrServiceImpl.java,4/6/46f585b55f9b2b80abd40f64aae4d929de754b07
+<EFBFBD>
+tnladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/StIvtBsrealstorattrMapper.java,8/d/8dab5749445e6bd915d23a28eb8e4a050c0ee04b
+<EFBFBD>
+wnladmin-system/src/main/java/org/nl/wms/base_manage/bsrealstorattr/service/dao/mapper/xml/StIvtBsrealstorattrMapper.xml,4/d/4d3e1f8ec363f936f590908e997cec63d4e3bd17
+<EFBFBD>
+nnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/impl/ActRuExecutionServiceImpl.java,9/6/96baf0e9c082471a9e3e86559513272d2680fb09
+<EFBFBD>
+[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dto/AlmMsgQuery.java,8/c/8c7ec5d7459e7ed0dc10a7f4f76f2a2d40f8240d
+<EFBFBD>
+cnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/controller/model/ActDeModelController.java,f/6/f6b31b91b229f78f8ac36ece953db50bf6d81854
+<EFBFBD>
+[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/dto/AlmInvQuery.java,a/c/ac795ed3f5d9af374a251274b3fb217c757ed16f
+<EFBFBD>
+Wnladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/dto/StorInvOutQuery.java,9/f/9fe2b6a548ba1008141ed40460ec4d82395db0a4
+<EFBFBD>
+dnladmin-system/src/main/java/org/nl/wms/stor_manage/io/service/out/iostor/dao/StIvtIostorinvOut.java,e/d/ed4f61ccea3d38d63cf8de22ea788a557b8715b9
+<EFBFBD>
+fnladmin-system/src/main/java/org/nl/wms/stor_manage/io/controller/out/StIvtIostorinvOutController.java,8/9/893a4d2aa05eceb25d834bf47e23e48568d02466
+<EFBFBD>
+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
+<EFBFBD>
+bnladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/controller/MdGruopDickController.java,2/b/2bf79ab59317d0d6b177fe4f01b5d69517e7c0bd
+<EFBFBD>
+_nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/IAlmEarlyInvService.java,f/3/f3f3536e2922d86604423471c2a52e7dded2361d
+<EFBFBD>
+gnladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/impl/AlmEarlyInvServiceImpl.java,d/3/d3dd85054b9911b6e121d28c55285b1ce5fa5f42
+<EFBFBD>
+[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
+<EFBFBD>
+[nladmin-system/src/main/java/org/nl/wms/early_manage/service/early_inv/dao/AlmEarlyInv.java,a/2/a2dc43bb714a304539d1b763f248ab450efbc0c4
+<EFBFBD>
+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
+<EFBFBD>
+pnladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/FlowNodeActivityBehavior.java,0/6/066ec6b83ae42a40454c31c59c5d269ee1dc3d65
+<EFBFBD>
+vnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/impl/MdPbVehicleMaterServiceImpl.java,c/0/c0b659d2615c5215dbc794369f9caa35a62a208f
+<EFBFBD>
+nnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/IMdPbVehicleMaterService.java,7/c/7cc3508f6ed0218b667780c6253629cad56fae40
+<EFBFBD>
+wnladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/service/dao/mapper/MdPbVehicleMaterMapper.java,f/1/f1f9af132b1fbfcbaa203f0c2ef78f302672c13e
+<EFBFBD>
+unladmin-system/src/main/java/org/nl/wms/flow_manage/flow/framework/engine/behavior/impl/EndEventActivityBehavior.java,4/6/468b8890e22da422beef66f1ceb2f42ad599595a
+<EFBFBD>
+^nladmin-system/src/main/java/org/nl/wms/stor_manage/monitor/listener/FlowEndEventListener.java,7/a/7adab1dfdd514fffb1b5bd7e8185ce2199e90baf
+<EFBFBD>
+Snladmin-system/src/main/java/org/nl/wms/flow_manage/monitor/event/FlowEndEvent.java,3/f/3fcd5ea3f30a701761063bc6a74a6e4184ce8aaf
+<EFBFBD>
+dnladmin-system/src/main/java/org/nl/wms/early_manage/controller/early_msg/AlmEarlyMsgController.java,b/b/bbc6aea0ca4c5586df592d4f6881443398ec92d2
+<EFBFBD>
+knladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/dao/mapper/xml/AlmEarlyMsgMapper.xml,a/0/a085d8991a3b8d868dc65e6b249925c758570ca8
+<EFBFBD>
+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
+<EFBFBD>
+gnladmin-system/src/main/java/org/nl/wms/early_manage/service/early_msg/impl/AlmEarlyMsgServiceImpl.java,4/c/4c0760c22498b67051d98696e64a0debbe4c97da
+<EFBFBD>
+snladmin-system/src/main/java/org/nl/wms/base_manage/vehicle/vehicleMater/controller/MdPbVehicleMaterController.java,f/e/fe3bd455dd5beee3dffeaf38da059cdedffdfc25
--- 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
@@ -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;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @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<Object> getAll(AlmDeferralQuery query, PageQuery page) {
+        return new ResponseEntity<>(TableDataInfo.build(almEarlyDeferralService.page(page.build(), query.build())), HttpStatus.OK);
+    }
+
+    @GetMapping("/dtl/{id}")
+    public ResponseEntity<Object> getDtl(@PathVariable String id) {
+        List<AlmEarlyDeferralDetail> list = almEarlyDeferralDetailService.list(new LambdaQueryWrapper<AlmEarlyDeferralDetail>().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<Object> saveDtl(@Validated @RequestBody JSONObject dto) {
+        String id = dto.getString("id");
+        LambdaUpdateWrapper<AlmEarlyDeferralDetail> 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<Object> delete(@RequestBody String[] ids) {
+        if (ids.length > 0) {
+            almEarlyDeferralService.removeByIds(Arrays.asList(ids));
+        }
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+
+    @PostMapping
+    public ResponseEntity<Object> 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<Object> update(@Validated @RequestBody JSONObject dto) {
+        AlmEarlyDeferral almEarlyDeferral = dto.toJavaObject(AlmEarlyDeferral.class);
+        almEarlyDeferral.setCreate_time(DateUtil.now());
+        almEarlyDeferralService.updateById(almEarlyDeferral);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+}
+
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@RestController
+@RequestMapping("/api/almEarlyDeferralDetail")
+public class AlmEarlyDeferralDetailController {
+
+}
+
--- 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
@@ -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);
+    }
+}
--- 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
@@ -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);
+}
--- 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
@@ -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);
+        }
+    }
+}
--- 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
@@ -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);
+    }
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface IAlmEarlyDeferralDetailService extends IService<AlmEarlyDeferralDetail> {
+
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface IAlmEarlyDeferralService extends IService<AlmEarlyDeferral> {
+
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @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;
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @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;
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface AlmEarlyDeferralDetailMapper extends BaseMapper<AlmEarlyDeferralDetail> {
+
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+public interface AlmEarlyDeferralMapper extends BaseMapper<AlmEarlyDeferral> {
+
+}
--- 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
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralDetailMapper">
+
+</mapper>
--- 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
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.nl.wms.early_manage.service.early_deferral.dao.mapper.AlmEarlyDeferralMapper">
+
+</mapper>
--- 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
@@ -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<AlmEarlyDeferral> {
+
+    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());
+    }
+
+
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@Service
+public class AlmEarlyDeferralDetailServiceImpl extends ServiceImpl<AlmEarlyDeferralDetailMapper, AlmEarlyDeferralDetail> implements IAlmEarlyDeferralDetailService {
+
+}
--- 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
@@ -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;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author generator
+ * @since 2024-05-31
+ */
+@Service
+public class AlmEarlyDeferralServiceImpl extends ServiceImpl<AlmEarlyDeferralMapper, AlmEarlyDeferral> implements IAlmEarlyDeferralService {
+
+}
--- 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<EarlyEvent> {
                    almEarlyMsg.setStor_code(earlyInv.getStor_code());
                    almEarlyMsgService.save(almEarlyMsg);
                    //根据notice_type下发通知
-                    System.out.println("下发通知");
+                    NotificationFactory.getNotification(notice_type).send("");
                }
            }
        }
--- 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
@@ -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<AlmEarlyDeferral> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(AlmEarlyDeferral::getIs_used, "1");
+        List<AlmEarlyDeferral> list = almEarlyDeferralService.list(lambdaQueryWrapper);
+        for (AlmEarlyDeferral almEarlyDeferral : list) {
+            LambdaQueryWrapper<AlmEarlyDeferralDetail> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(AlmEarlyDeferralDetail::getDeferral_id, almEarlyDeferral.getId());
+            List<AlmEarlyDeferralDetail> deferralDetails = almEarlyDeferralDetailService.list(lqw);
+            List<String> materialIds = deferralDetails.stream()
+                    .map(detail -> detail.getMaterial_id())
+                    .collect(Collectors.toList());
+            LambdaQueryWrapper<MdPbVehicleMater> mdPbVehicleMaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            mdPbVehicleMaterLambdaQueryWrapper.in(MdPbVehicleMater::getMaterial_id, materialIds);
+            List<MdPbVehicleMater> mdPbVehicleMaters = mdPbVehicleMaterService.list(mdPbVehicleMaterLambdaQueryWrapper);
+            List<MdPbVehicleMater> 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("");
+            }
+        }
+    }
+}