From 6d313a4a6f9f9d7ea65ec50ab0d4491e595edb97 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 15 十月 2024 09:47:26 +0800
Subject: [PATCH] -打印bug修改
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 102 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 939f970..b1e4310 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
@@ -5,13 +5,22 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
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;
@@ -36,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;
@@ -56,6 +68,37 @@
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);
+ }
+
/**
* 瀵煎嚭鐢熶骇宸ュ崟鍒楄〃
*/
@@ -67,6 +110,56 @@
List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo);
ExcelUtil<OmProductionOrdeInfo> util = new ExcelUtil<OmProductionOrdeInfo>(OmProductionOrdeInfo.class);
util.exportExcel(response, list, "鐢熶骇宸ュ崟鏁版嵁");
+ }
+
+ @GetMapping("/receivingWorkOrders")
+ public AjaxResult receivingWorkOrders()
+ {
+ String paramProductNum = "";
+ // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
+ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().orderByAsc(OmProductionOrdeInfo::getCreateTime));
+ if(list.size() > 0){
+ paramProductNum = list.get(list.size()-1).getProductNum();
+ }
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
+ JSONObject jsonObject = new JSONObject(orderJsonString);
+ // 浠嶫SONObject涓幏鍙杁ata瀵硅薄
+ JSONObject dataObject = jsonObject.getJSONObject("data");
+ String code = jsonObject.getStr("code");
+ // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛
+ if(code.equals("success")){
+ 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"));
+ omProductionOrdeInfo.setOnlineCompletionMark("0");
+ omProductionOrdeInfo.setSfResult("0");
+ if(dataObject.getStr("model").equals("PE01B")){
+ omProductionOrdeInfo.setSoftwareVersionCode("2");
+ }else {
+ omProductionOrdeInfo.setSoftwareVersionCode("0");
+ }
+ 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));
}
/**
@@ -159,4 +252,13 @@
{
return omProductionOrdeInfoService.findBytrolleyYardGetOne(omProductionOrdeInfo);
}
+
+ @GetMapping("/workReportingByStation/{id}/{stationCode}")
+ public AjaxResult workReportingByStation(@PathVariable("id") Long id, @PathVariable("stationCode") String stationCode)
+ {
+ OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo();
+ omProductionOrdeInfo.setId(id);
+ omProductionOrdeInfo.setStationCode(stationCode);
+ return omProductionOrdeInfoService.workReportingByStation(omProductionOrdeInfo);
+ }
}
--
Gitblit v1.9.3