From ce608d43dea0a772a8204d552274731d9107b607 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期三, 17 一月 2024 18:52:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 11 +++++++++--
jcdm-ui/src/views/main/bs/material/index.vue | 2 +-
jcdm-ui/src/views/main/bs/modelNumber/index.vue | 6 +++---
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 6 ++++--
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 8 ++++++++
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 2 ++
6 files changed, 27 insertions(+), 8 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 586fe63..15364ba 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
@@ -128,6 +128,7 @@
bsOrderScheduling.setProductionStatus("1");
bsOrderScheduling.setOperator(getUserName());
bsOrderScheduling.setOperateTime(fomateDate);
+ bsOrderScheduling.setProductType(omProductionOrdeInfo.getTypeL());//浜у搧绫诲瀷
bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
startCode++;
}
@@ -138,6 +139,7 @@
bsModelNumber.setModelDate(dateTimeRule);
bsModelNumber.setMaxnumValue((startCode - 1) + "");
bsModelNumber.setSaveTime(fomateDate);
+ bsModelNumber.setLastNumber((startCode - 1) + "");
bsModelNumberService.insertBsModelNumber(bsModelNumber);
}
//鏇存柊宸ュ崟鐘舵��
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
index f0307dd..54f74a6 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -148,6 +148,8 @@
@Excel(name = "绉嶇被")
private String typeZ;
+ private String typeL;
+
/** 棰勭暀瀛楁1 */
private String spareField1;
@@ -556,7 +558,13 @@
return typeZ;
}
+ public String getTypeL() {
+ return typeL;
+ }
+ public void setTypeL(String typeL) {
+ this.typeL = typeL;
+ }
@Override
diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index 7e35df9..640c5c6 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -98,7 +98,7 @@
</template>
</el-table-column>
- <el-table-column label="浜у搧鍨嬪彿" align="center" prop="typeZ" width="150">
+ <el-table-column label="鏈哄瀷" align="center" prop="typeZ" width="150">
</el-table-column>
<el-table-column label="鐗规畩浠ｇ爜" align="center" prop="mark" width="120">
</el-table-column>
diff --git a/jcdm-ui/src/views/main/bs/modelNumber/index.vue b/jcdm-ui/src/views/main/bs/modelNumber/index.vue
index 3ffb7c7..96b22c9 100644
--- a/jcdm-ui/src/views/main/bs/modelNumber/index.vue
+++ b/jcdm-ui/src/views/main/bs/modelNumber/index.vue
@@ -26,14 +26,14 @@
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
- <el-form-item label-width="100" label="涓婃鐨勭紪鍙�" prop="lastNumber">
+<!-- <el-form-item label-width="100" label="涓婃鐨勭紪鍙�" prop="lastNumber">
<el-input
v-model="queryParams.lastNumber"
placeholder="璇疯緭鍏ヤ笂娆＄殑缂栧彿"
clearable
@keyup.enter.native="handleQuery"
/>
- </el-form-item>
+ </el-form-item>-->
<!-- <el-form-item label="鐘舵��" prop="status">-->
<!-- <el-select v-model="queryParams.status" placeholder="璇烽�夋嫨鐘舵��" clearable>-->
@@ -97,7 +97,7 @@
<!-- </el-form-item>-->
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>
+<!-- <el-button type="warning" icon="el-icon-copy-document" size="mini" @click="advancedQuery">楂樼骇鏌ヨ</el-button>-->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index be23462..ee787eb 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -155,7 +155,9 @@
</el-table-column>
<el-table-column label="浜у搧绫诲瀷" align="center" prop="productType">
-
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.material_type" :value="scope.row.productType"/>
+ </template>
</el-table-column>
<el-table-column label="鏈哄瀷" align="center" prop="model">
@@ -368,7 +370,7 @@
export default {
name: "OrderScheduling",
- dicts: ['order_scheduling_produce_status','quality_status','print_status'],
+ dicts: ['order_scheduling_produce_status','quality_status','print_status','material_type'],
data() {
return {
// 閬僵灞�
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 34bcf4b..4ea0f3e 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -733,6 +733,7 @@
this.materialQueryParams.materialCode = response.data.productCode;
listMaterial(this.materialQueryParams).then(response => {
this.markNo = response.rows[0].mark
+ this.form.typeL = response.rows[0].typeL;
});
this.form = response.data;
this.Createopen = true;
@@ -780,14 +781,20 @@
model: this.form.typeZ,
modelDate: this.form.dateTimeRule,
}
+ if(startCode>999){
+ this.$message.error('璧峰缂栧彿瓒呭嚭鏈�澶ц寖鍥达紝璇疯緭鍏�1-999鐨勬暟瀛楋紒');
+ return;
+ }else if(startCode<1){
+ this.$message.error('璧峰缂栧彿瓒呭嚭鏈�灏忚寖鍥达紝璇疯緭鍏�1-999鐨勬暟瀛楋紒');
+ return;
+ }
listModelNumber(queryParams).then(response => {
if(response.rows.length === 0){
this.saveBoxCode()
}else {
let maxNumValue = response.rows[0].maxnumValue;
if(startCode<maxNumValue){
- this.$message.error('鏂板缓鐨勪笉鑳芥瘮鏌ヨ鍑虹殑灏�');
- return;
+ this.$message.error('绠变綋鏉＄爜閲嶅锛岃閲嶆柊杈撳叆璧峰缂栧彿锛�');
}else {
this.saveBoxCode()
}
--
Gitblit v1.9.3