From 517d1ae8b37b25228a771556cdf46b422b8b5bf5 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 04 八月 2024 15:50:41 +0800
Subject: [PATCH] 人工站进站查询工单逻辑修改
---
jcdm-ui/src/api/main/om/productionOrde/productionOrde.js | 9 +++++++++
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 24 +++++++++++++-----------
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 15 +++++++++++++++
3 files changed, 37 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 4ee78c6..395d29e 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
@@ -66,6 +66,21 @@
private MiloService miloService;
/**
+ * 鏍规嵁鎬绘垚鐮佹煡璇㈠伐鍗�
+ */
+ @GetMapping("/getProductionOrdeOneBySfcCode")
+ public AjaxResult getProductionOrdeOneBySfcCode(OmProductionOrdeInfo omProductionOrdeInfo)
+ {
+ OmProductionOrdeInfo ordeInfo = omProductionOrdeInfoService.getOne(new LambdaQueryWrapper<OmProductionOrdeInfo>()
+ .eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum()));
+ if(ObjectUtil.isNotNull(ordeInfo)){
+ return AjaxResult.success(ordeInfo);
+ }else {
+ return AjaxResult.error("鏈煡璇㈠埌宸ュ崟!");
+ }
+ }
+
+ /**
* 鏌ヨ鐢熶骇宸ュ崟鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('om:productionOrde:list')")
diff --git a/jcdm-ui/src/api/main/om/productionOrde/productionOrde.js b/jcdm-ui/src/api/main/om/productionOrde/productionOrde.js
index c773566..ea9d8fa 100644
--- a/jcdm-ui/src/api/main/om/productionOrde/productionOrde.js
+++ b/jcdm-ui/src/api/main/om/productionOrde/productionOrde.js
@@ -9,6 +9,15 @@
})
}
+// 鏍规嵁鎬绘垚鐮佹煡璇㈠伐鍗�
+export function getProductionOrdeOneBySfcCode(query) {
+ return request({
+ url: '/om/productionOrde/getProductionOrdeOneBySfcCode',
+ method: 'get',
+ params: query
+ })
+}
+
// 鏌ヨ鐢熶骇宸ュ崟鍒楄〃
export function bindYzSfcFlag(query) {
return request({
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 6f7a94a..3cc648a 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -312,7 +312,7 @@
import {
bindYzSfcFlag,
checkCarCode, checkYzSfcCode,
- findBytrolleyYardGetOne,
+ findBytrolleyYardGetOne, getProductionOrdeOneBySfcCode,
listProductionOrde, mozuReceivingWorkOrders,
receivingWorkOrders,
trolleyYardBinDing
@@ -613,17 +613,19 @@
},
/** 鏌ヨ宸ュ崟鍒楄〃 */
async getList() {
- await listProductionOrde(this.queryParams).then(response => {
- let rowsData = response.rows[0];
- console.log(rowsData)
- this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
- this.workpieceInformation.productCode = rowsData.productCode;
- this.workpieceInformation.materialCode = rowsData.materialCode;
- this.workpieceInformation.planQty = rowsData.planQty;
- this.headContent.cardCode = rowsData.trolleyYard;
+ await getProductionOrdeOneBySfcCode(this.queryParams).then(response => {
+ if(response.code === 200){
+ const rowsData = response.data
+ this.workpieceInformation.workOrderNo = rowsData.workOrderNo;
+ this.workpieceInformation.productCode = rowsData.productCode;
+ this.workpieceInformation.materialCode = rowsData.materialCode;
+ this.workpieceInformation.planQty = rowsData.planQty;
+ this.headContent.cardCode = rowsData.trolleyYard;
+
+ this.getListFormulaChild()
+ this.workpieceInformation.inboundTime = this.getCurrentTime()
+ }
});
- this.getListFormulaChild()
- this.workpieceInformation.inboundTime = this.getCurrentTime()
},
initializedData(){
--
Gitblit v1.9.3