From 9bc5106810d7c0e6f27e904b584c9bbfb3725a19 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期日, 28 四月 2024 17:42:09 +0800
Subject: [PATCH] change model11
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 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..4e82039 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
@@ -100,7 +100,7 @@
}
/**
- * 鏂板鐢熶骇宸ュ崟
+ * 鐢熸垚鎸夐挳
*/
@PostMapping("/orderSchedulingForBoxCode")
public AjaxResult addOrderSchedulingForBoxCode(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo)
@@ -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