From 9c21d0b197cee42ab475570f82eba18cd9307e70 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期一, 15 一月 2024 18:27:46 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 63a195d..7e9648d 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
@@ -2,8 +2,13 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.jcdm.main.bs.orderScheduling.domain.BsOrderScheduling;
+import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
+import com.jcdm.main.webservice.service.ReceivingServices;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +38,9 @@
{
@Autowired
private IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
+ @Autowired
+ private IBsOrderSchedulingService bsOrderSchedulingService;
/**
* 鏌ヨ鐢熶骇宸ュ崟鍒楄〃
@@ -81,6 +89,30 @@
}
/**
+ * 鏂板鐢熶骇宸ュ崟
+ */
+ @PostMapping("/orderSchedulingForBoxCode")
+ public AjaxResult addOrderSchedulingForBoxCode(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo)
+ {
+ Integer startCode = Integer.parseInt(omProductionOrdeInfo.getStartCode());//寮�濮嬬紪鍙�
+ Integer planQty = Math.toIntExact(omProductionOrdeInfo.getPlanQty());//璁″垝鏁伴噺
+ String dateTimeRule = omProductionOrdeInfo.getDateTimeRule();
+
+ for(int i=0;i<planQty;i++){
+ BsOrderScheduling bsOrderScheduling = new BsOrderScheduling();
+ bsOrderScheduling.setOrderNo(omProductionOrdeInfo.getWorkOrderNo());
+ bsOrderScheduling.setModel(omProductionOrdeInfo.getTypeZ());
+ bsOrderScheduling.setEngineNo(omProductionOrdeInfo.getTypeZ() + " "+dateTimeRule+ StringUtils.leftPad(String.valueOf(startCode),3, "0"));
+ bsOrderScheduling.setStatus("1");
+ bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
+ startCode ++;
+ }
+
+ omProductionOrdeInfo.setOrderStatus("2");//鏇存柊宸ュ崟鐘舵��
+ return toAjax(omProductionOrdeInfoService.updateOmProductionOrdeInfo(omProductionOrdeInfo));
+ }
+
+ /**
* 淇敼鐢熶骇宸ュ崟
*/
@PreAuthorize("@ss.hasPermi('om:productionOrde:edit')")
@@ -111,4 +143,14 @@
{
return omProductionOrdeInfoService.upDownMove(omProductionOrdeInfo);
}
+
+ /**
+ * table鍒椾笂绉讳笅绉�
+ */
+ @GetMapping("/getProductionNotice")
+ public AjaxResult getProductionNotice(OmProductionOrdeInfo omProductionOrdeInfo)
+ {
+ ReceivingServices.insertWebserviceData(omProductionOrdeInfo.getProductionNotice());
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.9.3