|
|
@@ -209,10 +209,8 @@
|
|
|
batchNoList.value = [res.rows[0]];
|
|
|
dayWork.value.lotId = batchNoList.value[0].id;
|
|
|
dayWork.value.lotCode = batchNoList.value[0].lotCode;
|
|
|
- if (dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId) {
|
|
|
dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
|
|
|
store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
|
|
|
- }
|
|
|
getProcessInfo(batchNoList.value[0])
|
|
|
getFurnaceInfo(batchNoList.value[0])
|
|
|
} else {
|
|
|
@@ -237,10 +235,8 @@
|
|
|
}
|
|
|
dayWork.value.lotId = batchNoList.value[0].id;
|
|
|
dayWork.value.lotCode = batchNoList.value[0].lotCode;
|
|
|
- if (dayWork.value.technologicalProcessId != batchNoList.value[0].technologicalProcessId) {
|
|
|
dayWork.value.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
|
|
|
store.planDetails.technologicalProcessId = batchNoList.value[0].technologicalProcessId;
|
|
|
- }
|
|
|
getProcessInfo(batchNoList.value[0])
|
|
|
//提示当前批次是废品回用
|
|
|
if (batchNoList.value[0].isAmend == 1) {
|
|
|
@@ -301,7 +297,6 @@
|
|
|
header,
|
|
|
sslVerify: false,
|
|
|
success: (res) => {
|
|
|
- console.log(res.data);
|
|
|
if (res.data.code == 200 && res.data.data.length > 0) {
|
|
|
for (let i = 0; i < res.data.data.length; i++) {
|
|
|
furnaceNumberInfoList.value[i] = {
|
|
|
@@ -321,10 +316,10 @@
|
|
|
} else {
|
|
|
isWasteRecyclingFlag.value = false
|
|
|
furnaceInfo.value.furnaceNumber = "废品回用"
|
|
|
+ furnaceInfo.value.firstTechnicalRequirement = "废品回用"
|
|
|
dayWork.value.furnaceNoInfo = furnaceInfo.value
|
|
|
basicInfo.value = dayWork.value.furnaceNoInfo
|
|
|
}
|
|
|
- console.log(basicInfo.value)
|
|
|
}
|
|
|
|
|
|
function iconClick() {
|
|
|
@@ -337,9 +332,10 @@
|
|
|
for (let i = 0; i < lotList.value.length; i++) {
|
|
|
if (lotList.value[i].lotCode == lotCode) {
|
|
|
batchNoList.value = [lotList.value[i]];
|
|
|
- console.log(batchNoList.value)
|
|
|
dayWork.value.lotId = lotList.value[i].id;
|
|
|
dayWork.value.lotCode = lotList.value[i].lotCode;
|
|
|
+ dayWork.value.technologicalProcessId = lotList.value[i].technologicalProcessId;
|
|
|
+ store.planDetails.technologicalProcessId = lotList.value[i].technologicalProcessId;
|
|
|
if (batchNoList.value[0].isWasteRecycling == 1) {
|
|
|
isWasteRecyclingFlag.value = false
|
|
|
uni.showToast({
|
|
|
@@ -380,7 +376,6 @@
|
|
|
}).then(res => {
|
|
|
if (res.rows.length > 0) {
|
|
|
var abNormaLotCode = res.rows.map(obj => obj.lotCode)
|
|
|
- console.log(abNormaLotCode.includes(lotCode))
|
|
|
if (abNormaLotCode.includes(lotCode)) {
|
|
|
uni.showToast({
|
|
|
icon: "none",
|
|
|
@@ -444,11 +439,14 @@
|
|
|
.technologicalProcessDetailId : v.id,
|
|
|
processId: v.processId,
|
|
|
processStepNumber: v.processStepNumber,
|
|
|
- index: index
|
|
|
+ index: index,
|
|
|
+ technologicalProcessId:v.technologicalProcessId ? v
|
|
|
+ .technologicalProcessId : v.lotTechnologicalProcessId
|
|
|
+
|
|
|
}))
|
|
|
- console.log(processList.value)
|
|
|
selectedProcess.value = processList.value[0].value;
|
|
|
dayWork.value.processId = processList.value[0].processId;
|
|
|
+ dayWork.value.technologicalProcessId = processList.value[0].technologicalProcessId
|
|
|
dayWork.value.technologicalProcessDetailId = selectedProcess.value
|
|
|
dayWork.value.processStepNumber = processList.value.findIndex(v => v.value ===
|
|
|
selectedProcess.value) >= 0 ?
|
|
|
@@ -580,7 +578,6 @@
|
|
|
})
|
|
|
return;
|
|
|
}
|
|
|
- console.log(basicInfo.value)
|
|
|
if (dayWork.value.furnaceNoInfo == null) {
|
|
|
uni.showToast({
|
|
|
icon: 'none',
|
|
|
@@ -590,7 +587,6 @@
|
|
|
}
|
|
|
dayWork.value.isWasteRecycling = batchNoList.value[0].isWasteRecycling
|
|
|
dayWork.value.isAmend = batchNoList.value[0].isAmend
|
|
|
-
|
|
|
store.furnaceNumberInfo = basicInfo.value;
|
|
|
if (checkLotCode(dayWork.value.lotCode)) {
|
|
|
saveDayWork(dayWork.value).then(res => {
|
