From a846f28bef985e7671f0b469fb73541cbfb08a93 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 01 六月 2024 11:15:39 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
index 1b85ef5..65b724a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java
@@ -127,7 +127,11 @@
             omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
             omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
             omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
-            omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+            if(dataObject.getStr("model").equals("PE01A")){
+                omProductionOrdeInfo.setProductCode("1P102S");
+            }else {
+                omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+            }
             omProductionOrdeInfo.setCreateTime(new Date());
             omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
 
@@ -139,6 +143,14 @@
         return AjaxResult.success(dataObject.getStr("productNum"));
     }
 
+    @GetMapping(value = "/jieBang/{id}")
+    public AjaxResult jieBang(@PathVariable("id") Long id)
+    {
+        OmProductionOrdeInfo byId = omProductionOrdeInfoService.getById(id);
+        byId.setTrolleyYard("");
+        return success(omProductionOrdeInfoService.saveOrUpdate(byId));
+    }
+
     /**
      * 鑾峰彇鐢熶骇宸ュ崟璇︾粏淇℃伅
      */

--
Gitblit v1.9.3