From c9c1560eeffdc73c38ab8ef6e1492b164b2360f5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 16 六月 2024 09:32:56 +0800
Subject: [PATCH] 临时表功能上传
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 65b724a..f645c2e 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
@@ -17,7 +17,10 @@
import com.jcdm.main.om.productionOrde.mapper.OmProductionOrdeInfoMapper;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.restful.factoryMes.service.RestfulService;
+import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.loadtime.Aj;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -42,10 +45,13 @@
* @author ruimin
* @date 2023-12-11
*/
+@Slf4j
@RestController
@RequestMapping("/om/productionOrde")
public class OmProductionOrdeInfoController extends BaseController
{
+ private static final Logger logger = LoggerFactory.getLogger("sys-user");
+
@Autowired
private IOmProductionOrdeInfoService omProductionOrdeInfoService;
@@ -122,24 +128,26 @@
String code = jsonObject.getStr("code");
// 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
if(code.equals("success")){
- OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
- omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
- omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
- omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
- omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
- if(dataObject.getStr("model").equals("PE01A")){
- omProductionOrdeInfo.setProductCode("1P102S");
- }else {
- omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+ logger.info("璇锋眰宸ュ巶MES宸ュ崟锛氬叆鍙俻ack{}鍑哄弬pack锛歿}",paramProductNum,dataObject.getStr("productNum"));
+ List<OmProductionOrdeInfo> check = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum,dataObject.getStr("productNum")));
+ if(check.size() == 0){
+ OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
+ omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum"));
+ omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
+ omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
+ omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ if(dataObject.getStr("model").equals("PE01A")){
+ omProductionOrdeInfo.setProductCode("1P102S");
+ }else {
+ omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+ }
+ omProductionOrdeInfo.setCreateTime(new Date());
+ omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
+ omProductionOrdeInfoService.save(omProductionOrdeInfo);
}
- omProductionOrdeInfo.setCreateTime(new Date());
- omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
-
- omProductionOrdeInfoService.save(omProductionOrdeInfo);
}else {
return AjaxResult.error("鎺ュ崟澶辫触,璇疯仈绯荤鐞嗗憳");
}
-
return AjaxResult.success(dataObject.getStr("productNum"));
}
--
Gitblit v1.9.3