From 28cd73a27061f684feda88d2d3e5f26794bbd591 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 23 一月 2024 10:28:14 +0800
Subject: [PATCH] 更新OPCUA

---
 jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 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 85934d5..3357f1e 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
@@ -128,6 +128,8 @@
                 bsOrderScheduling.setProductionStatus("1");
                 bsOrderScheduling.setOperator(getUserName());
                 bsOrderScheduling.setOperateTime(fomateDate);
+                bsOrderScheduling.setProductType(omProductionOrdeInfo.getTypeL());//浜у搧绫诲瀷
+                bsOrderScheduling.setWhetherOrPrint("0");
                 bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
                 startCode++;
             }
@@ -138,6 +140,7 @@
             bsModelNumber.setModelDate(dateTimeRule);
             bsModelNumber.setMaxnumValue((startCode - 1) + "");
             bsModelNumber.setSaveTime(fomateDate);
+            bsModelNumber.setLastNumber((startCode - 1) + "");
             bsModelNumberService.insertBsModelNumber(bsModelNumber);
         }
         //鏇存柊宸ュ崟鐘舵��
@@ -180,8 +183,9 @@
     }
 
     /**
-     * table鍒椾笂绉讳笅绉�
+     * 鎺ユ敹宸ュ崟
      */
+    @PreAuthorize("@ss.hasPermi('om:productionOrde:receive')")
     @GetMapping("/getProductionNotice")
     public AjaxResult getProductionNotice(OmProductionOrdeInfo omProductionOrdeInfo)
     {
@@ -193,7 +197,9 @@
             } catch (Exception e) {
                 return error("鎺ユ敹澶辫触锛佽妫�鏌ラ�氱煡鍗曞彿");
             }
+        }else {
+            return warn("璇ラ�氱煡鍗曞凡缁忔帴鏀跺畬姣曪紝涓嶈兘閲嶅鎺ユ敹锛�");
         }
-        return warn("璇ヨ鍗曞凡鎺ユ敹瀹屾瘯锛屼笉鑳介噸澶嶆帴鏀讹紒");
+        return AjaxResult.success("鎺ユ敹鎴愬姛锛�");
     }
 }

--
Gitblit v1.9.3