From 91b54fc007c9e82087738048d3b767c9645a6aec Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 06 九月 2024 09:45:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java | 20 +++++----
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 2
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 46 +++++++---------------
3 files changed, 27 insertions(+), 41 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
index 28eccb6..43593d8 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -528,17 +528,19 @@
@Override
public AjaxResult updateTighteningFormula(BsFormulaChildInfo bsFormulaChildInfo) {
Boolean b = true;
- BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
- getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
- getMaterTwo.setOperationType("2");
- List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
- List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
- for (String s : collect) {
- if(s.equals("")){
- return AjaxResult.error("鎵爜鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
+ if(!"OP100".equals(bsFormulaChildInfo.getLocationCode())){
+ BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo();
+ getMaterTwo.setProductCode(bsFormulaChildInfo.getProductCode());
+ getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode());
+ getMaterTwo.setOperationType("2");
+ List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo);
+ List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList());
+ for (String s : collect) {
+ if(s.equals("")){
+ return AjaxResult.error("鎵爜鏈畬鎴愶紝绂佹鎷х揣鎿嶄綔锛�");
+ }
}
}
-
//娣诲姞鎷х揣鍙傛暟-鍙傛暟閲囬泦琛�
DaParamCollection daParamCollection = new DaParamCollection();
daParamCollection.setParamCode(bsFormulaChildInfo.getParamCode());
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 62605a9..3b31588 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -91,7 +91,7 @@
//涓荤嚎浜哄伐宸ヤ綅
Constants.OP040_OP160.add(Constants.OP040);
- //Constants.OP040_OP160.add(Constants.OP060);
+ Constants.OP040_OP160.add(Constants.OP080);
Constants.OP040_OP160.add(Constants.OP070);
Constants.OP040_OP160.add(Constants.OP100);
Constants.OP040_OP160.add(Constants.OP120_2);
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index 96ac33d..9c08027 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -289,7 +289,7 @@
name: "stationTerminal",
data() {
return {
- text: 'P9900166410#T2342325325235235\n#V993983#SSW002.005#HHW001.001#NMCU#',
+ text: 'P9900200461#T2408170000004 #V993983#SSW001.001#HHW001.001#NMCU',
materialCode: '', // 鐗╂枡缂栫爜
carCode: '',
showInput: false,
@@ -424,24 +424,6 @@
}
},
- // getWorkOrders(){
- // if(this.headContent.sfcCode === '' || this.headContent.sfcCode === null){
- // //鎺ユ敹宸ュ崟
- // const param = {
- // lineCode: this.headContent.processesCode
- // }
- // mozuReceivingWorkOrders(param).then(response => {
- // this.headContent.sfcCode = response.msg;
- // this.queryParams.productNum = response.msg;
- // this.getList()
- // this.cakeLamp.scanFinish = 1
- // this.cakeLamp.startWork = 1
- // this.cakeLamp.InPlace = 1
- // });
- // }else {
- // this.$message.error("宸茬粡鏈夊伐鍗曚簡锛屼笉鑳芥帴鏀讹紒");
- // }
- // },
serialLink() {
this.open1 = true
},
@@ -538,16 +520,18 @@
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;
+ if(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;
+ this.getListFormulaChild()
+ this.workpieceInformation.inboundTime = this.getCurrentTime()
+ }else {
+ this.$message.error('绯荤粺娌℃湁姝ゅ伐鍗曪紝璇烽噸鏂版壂鐮侊紒');
+ }
});
- this.getListFormulaChild()
- this.workpieceInformation.inboundTime = this.getCurrentTime()
-
},
initializedData(){
@@ -564,7 +548,7 @@
this.cakeLamp.InPlace = 1
// this.test1()
// this.test2()
- this.text = 'P9900166410#T'+this.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
+ this.text = 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU'
}
});
},
@@ -595,7 +579,7 @@
let qrCode = new QRCode('canvasWrapper1',{
width: 83,
height: 83,
- text: 'P9900166410#T'+ this.headContent.sfcCode +'#V993983#SSW002.005#HHW001.001#NMCU#',
+ text: 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU',
colorDark: '#000',
colorLight: '#fff'
})
@@ -608,7 +592,7 @@
let qrCode = new QRCode('canvasWrapper2',{
width: 83,
height: 83,
- text: 'P9900166410#T'+ this.headContent.sfcCode +'#V993983#SSW002.005#HHW001.001#NMCU#',
+ text: 'P9900200461#T'+this.headContent.sfcCode+' #V993983#SSW001.001#HHW001.001#NMCU',
colorDark: '#000',
colorLight: '#fff'
})
--
Gitblit v1.9.3