From 508aac599c24711a3c1f7cfa76d9025c8e73b89f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 25 二月 2023 17:04:05 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/OrderController.java  |   10 ++++++++--
 src/main/resources/mapper/WrkDetlMapper.xml                |    1 +
 src/main/java/com/zy/asrs/entity/WrkMast.java              |   12 ++++++------
 src/main/webapp/static/js/order/order.js                   |    4 ++--
 src/main/java/com/zy/asrs/entity/WrkMastLog.java           |    4 ++++
 src/main/java/com/zy/asrs/controller/MobileController.java |    2 +-
 6 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4a80660..c324e16 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -130,7 +130,7 @@
                         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);
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 6c9d546..fd50042 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -242,10 +242,12 @@
         double totalQty = 0;
         double wrkQty = 0;
         double lackQty = 0;
+        double endQty = 0;
         for (OrderDetl orderDetl : orderDetls) {
             totalQty = totalQty + orderDetl.getAnfme();
-            wrkQty = wrkQty + orderDetl.getQty();
-            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
+            wrkQty = wrkQty + orderDetl.getWorkQty();
+            endQty = endQty + orderDetl.getQty();
+            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
             if (issued > 0.0) {
                 List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrigin(), null);
                 for (LocDetl locDetl : locDetls) {
@@ -267,6 +269,9 @@
             WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
             if (wrkMast == null) {
                 WrkMastLog wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()));
+                if (wrkMastLog.getIoType()==103){
+                    wrkMastLog = wrkMastLogService.selectOne(new EntityWrapper<WrkMastLog>().eq("wrk_no", wrkDetl.getWrkNo()).eq("io_time", wrkDetl.getIoTime()).eq("io_type",53));
+                }
                 if (wrkMastLog != null) {
                     wrkMast = new WrkMast();
                     BeanUtils.copyProperties(wrkMastLog, wrkMast);
@@ -295,6 +300,7 @@
                 .add("totalQty", totalQty)
                 .add("wrkQty", wrkQty)
                 .add("lackQty", lackQty)
+                .add("endQty",endQty)
         );
     }
 
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..83298e9 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -481,12 +481,12 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
     }
 
-    public void setErrorMemo(String errorMemo) {
-        if (errorMemo.length() > 255) {
-            errorMemo = errorMemo.substring(0, 150);
-        }
-        this.errorMemo = errorMemo;
-    }
+//    public void setErrorMemo(String errorMemo) {
+//        if (errorMemo.length() > 255) {
+//            errorMemo = errorMemo.substring(0, 150);
+//        }
+//        this.errorMemo = errorMemo;
+//    }
 
     public String getLogErrTime$(){
         if (Cools.isEmpty(this.logErrTime)){
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index efbd735..77b7e24 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -351,6 +351,10 @@
         return null;
     }
 
+    public long getWrkSts(){
+        return (long)this.wrkSts;
+    }
+
     public String getIoType$(){
         BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
         BasWrkIotype basWrkIotype = service.selectById(this.ioType);
diff --git a/src/main/resources/mapper/WrkDetlMapper.xml b/src/main/resources/mapper/WrkDetlMapper.xml
index 1cfa338..9ec480f 100644
--- a/src/main/resources/mapper/WrkDetlMapper.xml
+++ b/src/main/resources/mapper/WrkDetlMapper.xml
@@ -120,6 +120,7 @@
         left join asr_wrk_mast_log awml on awdl.wrk_no = awml.wrk_no and awdl.io_time = awml.io_time
         where awdl.order_no = #{orderNo}
         and (awml.manu_type is null or awml.manu_type != '鎵嬪姩鍙栨秷')
+        and awml.io_type != 103
         group by awdl.wrk_no, awdl.io_time, awdl.matnr
     </select>
 
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index e46458c..ad09170 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -501,7 +501,7 @@
                                 var traceCharts = echarts.init(document.getElementById('wrkTraceCharts'));
                                 var traceOptions = {
                                     title: {
-                                        text: '瀹屾垚/鎬婚噺', x: 'center', y: '38%',
+                                        text: '鎬婚噺/浣滀笟/瀹屾垚', x: 'center', y: '38%',
                                         textStyle: {fontSize: 18, color: '#262626', fontWeight: 'normal'},
                                         subtextStyle: {fontSize: 36, color: '#10B4E8'},
                                         itemGap: 20
@@ -514,7 +514,7 @@
                                 // 璧嬪��
                                 traceCharts.setOption({
                                     title: {
-                                        subtext: res.data.wrkQty+"/"+res.data.totalQty
+                                        subtext: res.data.totalQty+"/"+res.data.wrkQty+"/"+res.data.endQty
                                     },
                                     series: [
                                         {

--
Gitblit v1.9.1