From 4e83fa344f6cba81412fb354e7f32a88a8f34fde Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] -切换大模组代码更改
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..d53e15a 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,8 +136,10 @@
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("PE01A")){
- omProductionOrdeInfo.setProductCode("1P102S");
+ omProductionOrdeInfo.setProductCode("PE01B");
}else {
omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
}
@@ -249,4 +251,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