From c8a886a1b4c4516b6a73e802c5c9f42a6f357ca0 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 23 十月 2023 16:07:45 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/MobileController.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index cd6085b..c324e16 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -118,10 +118,10 @@
                 }
                 DocType docType = docTypeService.selectById(order.getDocType());
                 if (docType.getPakin() == null || docType.getPakin() != 1) {
-                    return R.ok();
+                    continue;
                 }
                 if (order.getSettle() > 2) {
-                    return R.ok();
+                    continue;
                 }
                 List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
                 if (!Cools.isEmpty(orderDetls)) {
@@ -130,7 +130,9 @@
                         CombParam.CombMat combMat = new CombParam.CombMat();
                         combMat.setMatnr(orderDetl.getMatnr());
                         combMat.setBatch(orderDetl.getBatch());
-                        combMat.setAnfme(orderDetl.getAnfme());
+                        combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+                        combMat.setMaktx(orderDetl.getMaktx());
+                        combMat.setSpecs(orderDetl.getSpecs());
                         combMats.add(combMat);
                     }
                     combParam.setCombMats(combMats);

--
Gitblit v1.9.1