From 1092553a73104036db71acb087327d7e0ca501a0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 11 六月 2025 17:30:35 +0800
Subject: [PATCH] bug修复；下发任务给rcs携带货架码

---
 src/main/java/com/zy/asrs/controller/OrderDetlController.java |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index d589562..77bc3c8 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -10,9 +10,11 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkDetl;
 import com.zy.asrs.entity.DocType;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.AgvWrkDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.common.web.BaseController;
 import lombok.Synchronized;
@@ -39,6 +41,9 @@
     private LocDetlService locDetlService;
     @Autowired
     private AgvLocDetlService agvLocDetlService;
+
+    @Autowired
+    private AgvWrkDetlMapper agvWrkDetlMapper;
 
     @RequestMapping(value = "/orderDetl/{id}/auth")
     @ManagerAuth
@@ -183,6 +188,8 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
         return R.ok(page);
     }
@@ -239,6 +246,8 @@
                 sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
             }
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
         return R.ok(page);
     }
@@ -307,6 +316,8 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
 
         return R.ok(page);
@@ -341,6 +352,43 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
+        }
+
+        return R.ok(page);
+    }
+
+    @RequestMapping(value = "/orderDetl/pakout/list/authV9")
+    @ManagerAuth
+    public R pakoutList9(@RequestParam(defaultValue = "1") Integer curr,
+                         @RequestParam(defaultValue = "10") Integer limit,
+                         @RequestParam(required = false) String orderByField,
+                         @RequestParam(required = false) String orderByType,
+                         @RequestParam Map<String, Object> param) {
+        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+        excludeTrash(param);
+        convertLike(param, wrapper);
+        if (!Cools.isEmpty(orderByField)) {
+            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+        } else {
+            wrapper.orderBy("create_time", false);
+        }
+        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
+        List<Long> docIds = new ArrayList<>();
+        for (DocType pakin : pakins) {
+            if (pakin.getDocId() == 48) {
+                docIds.add(pakin.getDocId());
+            }
+        }
+
+        wrapper.in("source", docIds);
+        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
+        for (OrderDetl record : page.getRecords()) {
+            Double sumAnfme = agvLocDetlService.getSumAnfmeProcessed2(record.getMatnr(), record.getThreeCode());
+            record.setStock(sumAnfme == null ? 0 : sumAnfme);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
 
         return R.ok(page);
@@ -374,11 +422,22 @@
         for (OrderDetl record : page.getRecords()) {
             Double sumAnfme = agvLocDetlService.getSumAnfme(record.getMatnr(), record.getThreeCode());
             record.setStock(sumAnfme == null ? 0 : sumAnfme);
+            //Double workNum = agvWrkDetlMapper.sumAnfmeByMatnr(record.getMatnr(), record.getThreeCode(), record.getOrderNo());
+            //record.setWorkNum(workNum == null ? 0 : workNum);
         }
 
         return R.ok(page);
     }
 
+    @RequestMapping(value = "/orderDetl/pakout/workNum")
+    @ManagerAuth
+    public R listWorkDetl() {
+        List<AgvWrkDetl> agvWrkDetls = agvWrkDetlMapper.listAnfmeByMatnr();
+        return R.ok(agvWrkDetls);
+
+    }
+
+
     private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
         for (Map.Entry<String, Object> entry : map.entrySet()) {
             String val = String.valueOf(entry.getValue());

--
Gitblit v1.9.1