From f119894e61a56d584c140b40baa6a4420dc8e8d6 Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 15 一月 2024 20:21:21 +0800
Subject: [PATCH] 上传配方
---
jcdm-ui/src/views/main/om/productionOrde/index.vue | 67 ++++++++++++++++++++-------------
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 7 +++
jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java | 3 +
3 files changed, 48 insertions(+), 29 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 7e9648d..f74c05a 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
@@ -1,5 +1,6 @@
package com.jcdm.main.om.productionOrde.controller;
+import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -25,6 +26,8 @@
import com.jcdm.common.enums.BusinessType;
import com.jcdm.common.utils.poi.ExcelUtil;
import com.jcdm.common.core.page.TableDataInfo;
+
+import static org.apache.commons.lang3.SystemUtils.getUserName;
/**
* 鐢熶骇宸ュ崟Controller
@@ -103,7 +106,9 @@
bsOrderScheduling.setOrderNo(omProductionOrdeInfo.getWorkOrderNo());
bsOrderScheduling.setModel(omProductionOrdeInfo.getTypeZ());
bsOrderScheduling.setEngineNo(omProductionOrdeInfo.getTypeZ() + " "+dateTimeRule+ StringUtils.leftPad(String.valueOf(startCode),3, "0"));
- bsOrderScheduling.setStatus("1");
+ bsOrderScheduling.setProductionStatus("1");
+ bsOrderScheduling.setOperator(getUserName());
+// bsOrderScheduling.setOperateTime(String.valueOf(new Date()));
bsOrderSchedulingService.insertBsOrderScheduling(bsOrderScheduling);
startCode ++;
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java b/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
index d5c02be..af08e28 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/webservice/service/ReceivingServices.java
@@ -97,11 +97,12 @@
ItemList itemList = gson.fromJson(jsonStr, ItemList.class);
for (Item item : itemList.getItem()) {
OmProductionOrdeInfo ordeInfo = new OmProductionOrdeInfo();
+ ordeInfo.setProductCode(item.getPLNBEZ());
ordeInfo.setProductName(item.getMAKTX());
ordeInfo.setLineCode(item.getFEVOR());
ordeInfo.setWorkOrderNo(item.getAUFNR());
ordeInfo.setPlanQty((long) Double.parseDouble(item.getPSMNG()));
- ordeInfo.setProductionNotice(item.getZSTAT());
+ ordeInfo.setProductionNotice(item.getZSCTZD());
ordeInfo.setTypeZ(item.getFERTH());
ordeInfo.setCreateUser(item.getZUSER());
ordeInfo.setCreateTime(item.getZDATE());
diff --git a/jcdm-ui/src/views/main/om/productionOrde/index.vue b/jcdm-ui/src/views/main/om/productionOrde/index.vue
index 97d14a7..fbc7e84 100644
--- a/jcdm-ui/src/views/main/om/productionOrde/index.vue
+++ b/jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -146,25 +146,25 @@
</el-table-column>
<el-table-column label="闇�姹傛暟閲�" align="center" prop="planQty">
</el-table-column>
- <el-table-column label="鐗╂枡绫诲瀷" width="140" align="center" prop="productCode">
+ <el-table-column label="浜у搧缂栧彿" width="140" align="center" prop="productCode">
</el-table-column>
- <el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">
- </el-table-column>
+<!-- <el-table-column label="瀹為檯鏁伴噺" width="160" align="center" prop="actualQty">-->
+<!-- </el-table-column>-->
<el-table-column label="宸ュ崟鐘舵��" align="center" prop="orderStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.order_state" :value="scope.row.orderStatus"/>
</template>
</el-table-column>
- <el-table-column label="宸ュ巶" align="center" prop="workshopCode">
- </el-table-column>
- <el-table-column label="浠撳簱" align="center">
- </el-table-column>
+<!-- <el-table-column label="宸ュ巶" align="center" prop="workshopCode">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="浠撳簱" align="center">-->
+<!-- </el-table-column>-->
<el-table-column label="浜х嚎" align="center" prop="lineCode">
</el-table-column>
- <el-table-column label="璁㈠崟绫诲瀷" align="center">
- </el-table-column>
- <el-table-column label="ZWS" align="center">
- </el-table-column>
+<!-- <el-table-column label="璁㈠崟绫诲瀷" align="center">-->
+<!-- </el-table-column>-->
+<!-- <el-table-column label="ZWS" align="center">-->
+<!-- </el-table-column>-->
<!-- <el-table-column label="宸ヨ壓娴佺▼" width="140" align="center" prop="routeCode">-->
<!-- </el-table-column>-->
@@ -194,7 +194,7 @@
</el-table-column>
<el-table-column width="160" label="閫氱煡鐢熸垚鏃ユ湡" align="center" prop="createTime">
</el-table-column>
- <el-table-column label="鎴愬搧鎻忚堪" width="160" align="center" prop="productName">
+ <el-table-column label="鎴愬搧鎻忚堪" width="320" align="center" prop="productName">
</el-table-column>
<!-- <el-table-column label="淇敼浜�" width="80" align="center" prop="updateUser">-->
<!-- </el-table-column>-->
@@ -341,7 +341,7 @@
<i class="el-icon-s-order"></i>
{{titleName}}
</span>
- <el-form ref="form" inline :model="form" :rules="CreateRules"label-width="80px">
+ <el-form ref="form" inline :model="form" :rules="CreateRules" label-width="80px">
<el-form-item label="绉嶇被" prop="typeZ">
<el-input disabled v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />
</el-form-item>
@@ -353,12 +353,11 @@
placeholder="璇烽�夋嫨鏃ユ湡" @input="handleCodeChange">
</el-date-picker>
</el-form-item>
- <el-form-item label="鏃ユ湡瑙勫垯" prop="dateTimeRule" hidden>
- <el-input v-model="form.dateTimeRule"/>
+ <el-form-item class="hidden-form-item" label="鏃ユ湡瑙勫垯" prop="dateTimeRule">
+ <el-input v-model="form.dateTimeRule"/>
</el-form-item>
-
<el-form-item label="璧峰缂栧彿" prop="startCode">
- <el-input v-model="form.startCode" placeholder="璇疯緭鍏ヨ捣濮嬬紪鍙�" @input="handleCodeChange"/>
+ <el-input type="number" v-model="form.startCode" placeholder="璇疯緭鍏ヨ捣濮嬬紪鍙�" @input="handleCodeChange"/>
</el-form-item>
<el-form-item label="璧锋缂栧彿" prop="startEndCode">
<el-input disabled v-model="form.startEndCode"/>
@@ -388,6 +387,7 @@
updateOrderScheduling,
generateNumbers
} from "@/api/main/bs/orderScheduling/orderScheduling";
+import {listMaterial} from "@/api/main/bs/material/material";
export default {
name: "ProductionOrde",
@@ -452,6 +452,11 @@
adds:null,
productionNotice: null,
},
+ materialQueryParams: {
+ pageNum: 1,
+ pageSize: 10,
+ materialCode: null,
+ },
// 琛ㄥ崟鍙傛暟
form: {},
@@ -475,12 +480,19 @@
year: [
{ required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
],
+ dateTime: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ startCode: [
+ { required: true, message: "涓嶈兘涓虹┖", trigger: "blur" }
+ ],
},
change: {
day: '',
month: '',
year: '',
},
+ markNo: '',
};
},
created() {
@@ -519,12 +531,12 @@
}
//鏃�
dateTimeRule = dateTimeRule + day;
+ dateTimeRule = dateTimeRule + this.markNo;
this.form.dateTimeRule = dateTimeRule;
//璧嬪�艰捣濮嬬紪鐮�
- this.form.startEndCode = dateTimeRule + startCode + "----" + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
+ this.form.startEndCode = dateTimeRule + startCode + "----" + dateTimeRule + String(parseInt(startCode) + parseInt(planQty)-1).padStart(3, '0') ;
}
},
-
getProductionNotice(){
getProductionNotice(this.queryParams).then(response => {
@@ -704,14 +716,16 @@
const id = Row.id || this.ids
getProductionOrde(id).then(response => {
console.log(response.data)
+ console.log(response.data.productCode)
+ this.materialQueryParams.materialCode = response.data.productCode;
+ listMaterial(this.materialQueryParams).then(response => {
+ this.markNo = response.rows[0].mark
+ });
this.form = response.data;
this.Createopen = true;
this.titleName = "鐢熸垚绠变綋鏉＄爜";
// return Array.from({ length: parseInt(this.actualQty) }, (_, index) => index + 1);
});
- this.$modal.msgSuccess(Row.actualQty);
-
-
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -753,7 +767,7 @@
if (this.form.id != null) {
addOrderSchedulingForBoxCode(this.form).then(response => {
this.$modal.msgSuccess("淇濆瓨鎴愬姛");
- this.open = false;
+ this.Createopen = false;
this.getList();
});
}
@@ -782,8 +796,7 @@
};
</script>
<style lang="scss" scoped>
-//::v-deep .el-dialog__header{
-// /*background-color: #f8f8f8;*/
-// background-color: #f8f8f9;
-//}
+.hidden-form-item {
+ display: none;
+}
</style>
--
Gitblit v1.9.3