From 653b17eac39c339774cd46291a9345493b253a1f Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 11 七月 2024 10:35:18 +0800
Subject: [PATCH] 100-1工位 接收工单 人工操作页面优化
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 21 ++++------
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 44 ---------------------
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 1
3 files changed, 10 insertions(+), 56 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 39ade17..bcb937b 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,49 +121,6 @@
util.exportExcel(response, list, "鐢熶骇宸ュ崟鏁版嵁");
}
- @GetMapping("/receivingWorkOrders")
- public AjaxResult receivingWorkOrders() throws Exception {
- String paramProductNum = "";
- Object productTypeObjcet = miloService.readFromOpcUa("thoroughfare" + "." + "device" + ".ProductType").getValue();//浜у搧绫诲瀷
- if (ObjectUtil.isNull(productTypeObjcet)) {
- return AjaxResult.error("鎺ュ崟澶辫触,PLC鏈紶杈撶敓浜х被鍨嬶紝璇疯仈绯荤鐞嗗憳");
- }
- String productType = productTypeObjcet.toString();//浜у搧绫诲瀷
- String materialCode = Constants.materialMap.get(productType);
- // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
- OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100",materialCode);
- 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("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("/mozuReceivingWorkOrders")
public AjaxResult mozuReceivingWorkOrders(OmProductionOrdeInfo paramOrder) throws Exception {
String paramProductNum = "";
@@ -192,6 +149,7 @@
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
omProductionOrdeInfo.setOnlineCompletionMark("0");
omProductionOrdeInfo.setSfResult("0");
omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index f36100c..4c46dec 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -280,6 +280,7 @@
omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum"));
omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode"));
omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode"));
+ omProductionOrdeInfo.setPlanQty(Long.valueOf(dataObject.getStr("plannedQuantity")));
omProductionOrdeInfo.setOnlineCompletionMark("0");
omProductionOrdeInfo.setSfResult("0");
omProductionOrdeInfo.setProductCode(dataObject.getStr("model"));
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 4e760fc..ec1cb6a 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -30,22 +30,15 @@
<span style="font-weight: bold">褰撳墠宸ヤ欢淇℃伅</span>
</div>
<el-descriptions :column="1" border :content-style="{'min-width': '140px'}">
-<!-- <el-descriptions :column="1" :label-style="{'font-size': '15px'}" border :content-style="{'min-width': '150px'}">-->
<el-descriptions-item label="宸ュ崟缂栧彿">
<span>{{workpieceInformation.workOrderNo}}</span>
</el-descriptions-item>
- <el-descriptions-item label="浜у搧鍨嬪彿">
- <span>{{workpieceInformation.productCode}}</span>
+ <el-descriptions-item label="鐗╂枡缂栫爜">
+ <span>{{workpieceInformation.materialCode}}</span>
</el-descriptions-item>
- <el-descriptions-item label="灏忚溅鐮�">
- <span>{{headContent.cardCode}}</span>
+ <el-descriptions-item label="璁″垝鏁伴噺">
+ <span>{{workpieceInformation.planQty}}</span>
</el-descriptions-item>
-<!-- <el-descriptions-item label="浜у搧鍨嬪彿">-->
-<!-- <span>{{workpieceInformation.productModel}}</span>-->
-<!-- </el-descriptions-item>-->
-<!-- <el-descriptions-item label="浜у搧鍚嶇О">-->
-<!-- <span>{{workpieceInformation.productName}}</span>-->
-<!-- </el-descriptions-item>-->
<el-descriptions-item label="寮�濮嬫椂闂�">
<span>{{workpieceInformation.inboundTime}}</span>
</el-descriptions-item>
@@ -367,6 +360,8 @@
productModel: null,
productName: null,
inboundTime: null,
+ materialCode: null,
+ planQty: null,
},
// 鏌ヨ鍙傛暟
queryParams: {
@@ -623,8 +618,8 @@
console.log(rowsData)
this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
this.workpieceInformation.productCode = rowsData.productCode;
- this.workpieceInformation.productModel = rowsData.productModel;
- this.workpieceInformation.productName = rowsData.productName;
+ this.workpieceInformation.materialCode = rowsData.materialCode;
+ this.workpieceInformation.planQty = rowsData.planQty;
this.headContent.cardCode = rowsData.trolleyYard;
});
this.getListFormulaChild()
--
Gitblit v1.9.3