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 | 20 ++++++++++++++++----
1 files changed, 16 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 f645c2e..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
@@ -121,7 +121,7 @@
if(list.size() > 0){
paramProductNum = list.get(list.size()-1).getProductNum();
}
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "OP230");
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230");
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
@@ -136,11 +136,14 @@
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
- if(dataObject.getStr("model").equals("PE01A")){
- omProductionOrdeInfo.setProductCode("1P102S");
+ omProductionOrdeInfo.setOnlineCompletionMark("0");
+ omProductionOrdeInfo.setSfResult("0");
+ if(dataObject.getStr("model").equals("PE01B")){
+ omProductionOrdeInfo.setSoftwareVersionCode("2");
}else {
- omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
+ omProductionOrdeInfo.setSoftwareVersionCode("0");
}
+ omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
omProductionOrdeInfo.setCreateTime(new Date());
omProductionOrdeInfo.setCreateUser("宸ュ巶MES");
omProductionOrdeInfoService.save(omProductionOrdeInfo);
@@ -249,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