diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js index 1a1af730..a101893f 100644 --- a/klp-ui/src/api/wms/coil.js +++ b/klp-ui/src/api/wms/coil.js @@ -203,13 +203,14 @@ export function cancelExportCoil(coilId) { } // 检查入场钢卷号或当前钢卷号是否合法（是否存在） -export function checkCoilNo({ currentCoilNo, enterCoilNo, coilId }) { +export function checkCoilNo({ currentCoilNo, enterCoilNo, coilId, supplierCoilNo }) { return request({ url: '/wms/materialCoil/checkCoilNoDuplicate', method: 'get', params: { currentCoilNo, enterCoilNo, + supplierCoilNo, coilId } }) @@ -253,15 +254,19 @@ export function restoreMaterialCoil(coilId) { /** * 开始分条，锁定钢卷 */ -export function startSpecialSplit(coilId) { +export function startSpecialSplit(coilId, actionType) { if (!coilId) { return Promise.reject(new Error('coilId is required')) } + if (!actionType) { + return Promise.reject(new Error('actionType is required')) + } return request({ url: '/wms/materialCoil/specialSplit/start', method: 'post', params: { - coilId + coilId, + actionType } }) } diff --git a/klp-ui/src/views/wms/coil/do/split.vue b/klp-ui/src/views/wms/coil/do/split.vue index c1333512..726e3cae 100644 --- a/klp-ui/src/views/wms/coil/do/split.vue +++ b/klp-ui/src/views/wms/coil/do/split.vue @@ -32,6 +32,7 @@ '镀锌工序': [ {value: '1988150263284953089', label: '镀锌原料库'}, {value: '1988150323162836993', label: '镀锌成品库'}, + {value: '1988150487185289217', label: '镀锌纵剪分条原料库'}, ], '脱脂工序': [ {value: '1988150545175736322', label: '脱脂原料库'}, @@ -55,7 +56,7 @@ ], } - if (this.actionType === '镀锌工序') { + if (this.actionType === '镀锌工序' || this.actionType === '脱脂工序' || this.actionType === '拉矫平整工序' || this.actionType === '双机架工序' || this.actionType === '镀铬工序') { this.useSpecialSplit = true } // 从map中获取默认的查询参数 diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 33e267e7..b5438c4d 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -35,7 +35,7 @@ - + @@ -457,6 +457,29 @@ export default { // }, trigger: 'blur' // }, ], + supplierCoilNo: [ + { required: true, message: "厂家原料卷号不能为空", trigger: "blur" }, + // 远程校验，检查钢卷号是否存在 + { + validator: (rule, value, callback) => { + if (this.form.coilId) { + // 新增时触发校验 + console.log('编辑时不触发校验'); + callback(); + } else { + checkCoilNo({ supplierCoilNo: value }).then(res => { + const { duplicateType } = res.data; + if (duplicateType === 'supplier' || duplicateType === 'both') { + // alert('厂家原料卷号重复，请重新输入'); + callback(new Error('厂家原料卷号重复，请重新输入')); + } else { + callback(); + } + }) + } + }, trigger: 'blur' + }, + ], materialType: [ { required: true, message: "材料类型不能为空", trigger: "change" } ], diff --git a/klp-ui/src/views/wms/coil/docorrent.vue b/klp-ui/src/views/wms/coil/docorrent.vue new file mode 100644 index 00000000..721eec75 --- /dev/null +++ b/klp-ui/src/views/wms/coil/docorrent.vue @@ -0,0 +1,724 @@ + + + + + + + + diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index 9ea0ca1e..09b0ad79 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -199,7 +199,7 @@
- 加工 领料 @@ -223,7 +223,7 @@
-

进行中的镀锌工序

+

进行中的{{ label }}

刷新
@@ -552,7 +552,7 @@ export default { degree: null, remark: null }, - tagSizeMap: { + tagSizeMap: { '2': { width: 100, height: 80, @@ -602,6 +602,42 @@ export default { }) return acidAction ? parseInt(acidAction.value) : null }, + splitButtonStyle() { + if (this.acidRollingActionType == 501) { + return { + backgroundColor: '#2cb867', + border: '1px solid #2cb867', + color: '#111' + } + } else if (this.acidRollingActionType == 502) { + return { + backgroundColor: 'purple', + border: '1px solid purple', + color: '#fff' + } + } else if (this.acidRollingActionType == 503) { + return { + backgroundColor: '#f56c6c', + border: '1px solid #f56c6c', + color: '#fff' + } + } else if (this.acidRollingActionType == 504) { + return { + backgroundColor: 'orange', + border: '1px solid orange', + color: '#111' + } + } else if (this.acidRollingActionType == 505) { + return { + // 青色 + backgroundColor: 'blue', + border: '1px solid blue', + color: '#fff' + } + } else { + return {} + } + } }, watch: { // 监听字典数据加载，当acidRollingActionType有值时自动加载待操作列表 @@ -643,9 +679,11 @@ export default { if (this.acidRollingActionType) { this.actionQueryParams.actionType = this.acidRollingActionType this.getPendingAction() + if (this.useSpecialSplit) { + this.getStepSplitList() + } } }) - this.getStepSplitList() }, mounted() { // 确保在mounted时也尝试加载（字典数据可能此时才加载完成） @@ -667,7 +705,7 @@ export default { // 在镀锌颜料库的卷使用镀锌原料标签 if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) { this.labelRender.type = '5'; - } + } // 脱脂原料库 else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) { this.labelRender.type = '6'; @@ -699,7 +737,11 @@ export default { getStepSplitList() { this.stepSpilt.loading = true - listPendingAction({ actionType: 501, actionStatus: 0 }).then(response => { + if (!this.acidRollingActionType) { + this.$message.error(`未找到${this.label}操作类型，请检查字典配置`) + return + } + listPendingAction({ actionType: this.acidRollingActionType, actionStatus: 0 }).then(response => { this.stepSpilt.list = response.rows || [] this.stepSpilt.loading = false }) @@ -964,7 +1006,7 @@ export default { try { await this.$modal.confirm('是否确认领料开始分步加工操作？') this.stepSpilt.loading = true - await startSpecialSplit(row.coilId); + await startSpecialSplit(row.coilId, this.acidRollingActionType); // await addPendingAction({ // coilId: row.coilId, // currentCoilNo: row.currentCoilNo, diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java index 12bb3709..7360d6a2 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsCoilPendingActionBo.java @@ -89,13 +89,13 @@ public class WmsCoilPendingActionBo extends BaseEntity { /** * 处理时间 */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date processTime; /** * 完成时间 */ - @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSX", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date completeTime; //开始时间和结束时间