From 8cfe20288690f2ba46c804f41f39e8aa48c2dea0 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期六, 15 六月 2024 09:08:30 +0800
Subject: [PATCH] 上传逻辑大版本更新
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 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 75e574a..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
@@ -11,12 +11,16 @@
import com.jcdm.common.core.domain.entity.SysUser;
import com.jcdm.common.core.domain.model.LoginUser;
import com.jcdm.common.utils.ServletUtils;
+import com.jcdm.common.utils.StringUtils;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo;
import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfoExcelImport;
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;
@@ -41,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;
@@ -59,6 +66,37 @@
// List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getWorkOrderNo, "W_202403120001"));
List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
return getDataTable(list);
+ }
+
+ @GetMapping("/checkCarCode")
+ public AjaxResult checkCarCode(OmProductionOrdeInfo omProductionOrdeInfo)
+ {
+ Integer i = 0;
+ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum()));
+ if(StringUtils.isNotBlank(list.get(0).getTrolleyYard())){
+ i = 1;
+ }
+ return AjaxResult.success(i);
+ }
+
+ @GetMapping("/checkYzSfcCode")
+ public AjaxResult checkYzSfcCode(OmProductionOrdeInfo omProductionOrdeInfo)
+ {
+ Integer i = 0;
+ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum()));
+ if(StringUtils.isNotBlank(list.get(0).getSpareField2())){
+ i = 1;
+ }
+ return AjaxResult.success(i);
+ }
+
+ @GetMapping("/bindYzSfcFlag")
+ public AjaxResult bindYzSfcFlag(OmProductionOrdeInfo omProductionOrdeInfo)
+ {
+ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum()));
+ list.get(0).setSpareField2("1");
+ omProductionOrdeInfoService.saveOrUpdate(list.get(0));
+ return AjaxResult.success(null);
}
/**
@@ -83,29 +121,44 @@
if(list.size() > 0){
paramProductNum = list.get(list.size()-1).getProductNum();
}
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "OP230");
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
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"));
- omProductionOrdeInfo.setCreateTime(new Date());
- omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
-
- omProductionOrdeInfoService.save(omProductionOrdeInfo);
+ 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);
+ }
}else {
return AjaxResult.error("鎺ュ崟澶辫触,璇疯仈绯荤鐞嗗憳");
}
-
return AjaxResult.success(dataObject.getStr("productNum"));
}
+ @GetMapping(value = "/jieBang/{id}")
+ public AjaxResult jieBang(@PathVariable("id") Long id)
+ {
+ OmProductionOrdeInfo byId = omProductionOrdeInfoService.getById(id);
+ byId.setTrolleyYard("");
+ return success(omProductionOrdeInfoService.saveOrUpdate(byId));
+ }
+
/**
* 鑾峰彇鐢熶骇宸ュ崟璇︾粏淇℃伅
*/
--
Gitblit v1.9.3