From 852cb4e84d21d214d2b1d61fe006746bb694f258 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期三, 24 一月 2024 13:43:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 b1f62a8..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,12 +183,23 @@
}
/**
- * table鍒椾笂绉讳笅绉�
+ * 鎺ユ敹宸ュ崟
*/
+ @PreAuthorize("@ss.hasPermi('om:productionOrde:receive')")
@GetMapping("/getProductionNotice")
public AjaxResult getProductionNotice(OmProductionOrdeInfo omProductionOrdeInfo)
{
- ReceivingServices.insertWebserviceData(omProductionOrdeInfo.getProductionNotice());
- return AjaxResult.success();
+ String productionNotice = omProductionOrdeInfo.getProductionNotice();
+ List<OmProductionOrdeInfo> omProductionOrdeInfos = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
+ if(omProductionOrdeInfos.size() == 0){
+ try {
+ ReceivingServices.insertWebserviceData(productionNotice);
+ } catch (Exception e) {
+ return error("鎺ユ敹澶辫触锛佽妫�鏌ラ�氱煡鍗曞彿");
+ }
+ }else {
+ return warn("璇ラ�氱煡鍗曞凡缁忔帴鏀跺畬姣曪紝涓嶈兘閲嶅鎺ユ敹锛�");
+ }
+ return AjaxResult.success("鎺ユ敹鎴愬姛锛�");
}
}
--
Gitblit v1.9.3