From 70ba74321b0f4ae2751c6afadf4484a4e19f99da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 11 八月 2023 18:09:24 +0800
Subject: [PATCH] 工单投料和产出状态流程为【生产中】

---
 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
index 8ae95e2..a6082f3 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordStandardServiceImpl.java
@@ -142,9 +142,10 @@
                 recordList.add(getWorkrecordModel(user,wStock,mp,materialListDTO.getNum()));
             }
         }
+
         //鎵归噺鎻掑叆鎶曟枡璁板綍
         workorderRecordExtMapper.insertBatch(recordList);
-        //鍗曟坊鍔犲巻鍙茶褰曪紙涓嶆洿鏂扮姸鎬侊級
+        //鍗曟坊鍔犲巻鍙茶褰曪紙鍒ゆ柇鏇存柊涓虹敓浜т腑锛�
         updateOrderInfo(user,mp,Constants.WORKORDER_HISTORY_STATUS.material);
         return param.getId();
     }
@@ -294,6 +295,13 @@
             order.setStatus(Constants.WORKORDER_STATUS.material);
         }else if(status ==Constants.WORKORDER_HISTORY_STATUS.done){
             order.setStatus(Constants.WORKORDER_STATUS.done);
+        }else if(status ==Constants.WORKORDER_HISTORY_STATUS.material){
+            //鎶曟枡鎿嶄綔
+            if(Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.create)
+                    ||Constants.equalsInteger(mp.getStatus(),Constants.WORKORDER_STATUS.material)){
+                //濡傛灉鏄凡鍒涘缓鎴栬�呭凡澶囨枡鐘舵�佺殑宸ュ崟锛屼慨鏀瑰叾鐘舵�佷负銆愮敓浜т腑銆�
+                order.setStatus(Constants.WORKORDER_STATUS.producing);
+            }
         }
         workorderExtMapper.updateById(order);
         workorderHistoryExtMapper.insertBatch(whList);

--
Gitblit v1.9.3