diff --git a/klp-ui/src/views/wms/coil/actflow.vue b/klp-ui/src/views/wms/coil/actflow.vue index b46496f8..04de57c2 100644 --- a/klp-ui/src/views/wms/coil/actflow.vue +++ b/klp-ui/src/views/wms/coil/actflow.vue @@ -157,6 +157,22 @@ + +
+
合卷操作
+
+
+
+ +
+
+
{{ item.label }}
+
{{ item.remark || '钢卷操作' }}
+
+
+
+
其他操作
@@ -270,12 +286,20 @@ export default { return value >= 100 && value <= 199; }); }, + // 合卷操作列表（200-299） + mergeTypes() { + if (!this.dict.type.action_type) return []; + return this.dict.type.action_type.filter(item => { + const value = parseInt(item.value); + return value >= 200 && value <= 299; + }); + }, // 其他操作列表（200-299等） otherTypes() { if (!this.dict.type.action_type) return []; return this.dict.type.action_type.filter(item => { const value = parseInt(item.value); - return value < 100 || value > 199; + return value < 100 || value > 299; }); } }, diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index 74907289..961a4fef 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -415,6 +415,7 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect import ProductSelect from "@/components/KLPService/ProductSelect"; import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect"; import CoilTraceResult from "../panels/CoilTraceResult.vue"; +import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint' export default { name: 'DoPage', @@ -753,10 +754,8 @@ export default { /** 预览标签 */ handlePreviewLabel(row) { this.labelRender.visible = true; - const item = row.itemType === 'product' ? row.product : row.rawMaterial; - const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; - - this.labelRender.type = row.itemType === 'product' ? '3' : '2' + const type = getCoilTagPrintType(row); + this.labelRender.type = type; this.labelRender.data = { ...row, itemName: itemName, diff --git a/klp-ui/src/views/wms/coil/docorrent.vue b/klp-ui/src/views/wms/coil/docorrent.vue index 73d50b67..71eec6a6 100644 --- a/klp-ui/src/views/wms/coil/docorrent.vue +++ b/klp-ui/src/views/wms/coil/docorrent.vue @@ -107,7 +107,8 @@ @@ -129,8 +130,10 @@ --> @@ -165,6 +168,23 @@
+ +
+
合卷操作
+
+
+
+ +
+
+
{{ item.label }}
+
{{ item.remark || '钢卷操作' }}
+
+
+
+
+
其他操作
@@ -195,7 +215,8 @@
- 确 定 + 确 + 定 取 消
@@ -279,12 +300,20 @@ export default { return value >= 100 && value <= 199; }); }, + // 合卷操作列表（200-299） + mergeTypes() { + if (!this.dict.type.action_type) return []; + return this.dict.type.action_type.filter(item => { + const value = parseInt(item.value); + return value >= 200 && value <= 299; + }); + }, // 其他操作列表（200-299等） otherTypes() { if (!this.dict.type.action_type) return []; return this.dict.type.action_type.filter(item => { const value = parseInt(item.value); - return value < 100 || value > 199; + return value < 100 || value > 299; }); } }, @@ -472,7 +501,7 @@ export default { } else if (actionType < 100) { path = '/wms/typing'; - } + } // 其他操作类型 else { this.$message.error('特殊操作请到专门的页面进行处理'); @@ -754,6 +783,3 @@ export default { } } - - - diff --git a/klp-ui/src/views/wms/coil/js/coilPrint.js b/klp-ui/src/views/wms/coil/js/coilPrint.js new file mode 100644 index 00000000..84f4b561 --- /dev/null +++ b/klp-ui/src/views/wms/coil/js/coilPrint.js @@ -0,0 +1,46 @@ +const ECoilPrintType = { + '原料标签': '2', + '成品标签': '3', + '镀锌成品': '4', + '镀铬成品': 'ge', + '镀锌原料': '5', + '脱脂原料': '6' +} + +/** + * 根据钢卷信息获取打印的标签类型 + * @param {*} coil 钢卷信息 + * @returns 打印的标签类型 + */ +export const getCoilTagPrintType = (coil) => { + const item = coil.itemType === 'product' ? coil.product : coil.rawMaterial; + const itemName = coil.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; + const itemType = coil.itemType || ''; + const warehouseId = coil.warehouseId || ''; + + let type = '2' + // 在镀锌颜料库的卷使用镀锌原料标签 + if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) { + type = ECoilPrintType['镀锌原料']; + } + // 脱脂原料库 + else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) { + type = ECoilPrintType['脱脂原料']; + } + else if (itemType == 'raw_material') { + type = ECoilPrintType['原料标签']; + } else if (itemType == 'product' && itemName == '冷硬卷') { + type = ECoilPrintType['成品标签']; + } else if (itemType == 'product' && itemName == '热轧卷板') { + type = ECoilPrintType['成品标签']; + } else if (itemType == 'product' && itemName == '镀锌卷') { + type = ECoilPrintType['镀锌成品']; + } else if (itemType == 'product' && itemName == '冷轧卷') { + type = ECoilPrintType['成品标签']; + } else if (itemType == 'product' && itemName == '镀铬卷') { + type = ECoilPrintType['镀铬成品']; + } else { + type = ECoilPrintType['成品标签']; + } + return type +} \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 1ea174d9..487afc37 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -102,11 +102,11 @@
- + - + @@ -115,14 +115,14 @@
- + - + @@ -166,13 +166,13 @@
- + - + @@ -181,7 +181,7 @@
- + @@ -211,7 +211,7 @@ - +
@@ -272,7 +272,35 @@ export default { actualWidth: undefined, }, rules: { - + currentCoilNo: [ + { required: true, message: "当前钢卷号不能为空", trigger: "blur" }, + { + // 当前钢卷号必须大于等于10位 + validator: (rule, value, callback) => { + if (value.length < 10) { + callback(new Error('当前钢卷号必须大于等于10位')); + } else { + callback(); + } + }, trigger: 'blur' + }, + ], + team: [ + { required: true, message: "班组不能为空", trigger: "change" } + ], + materialType: [ + { required: true, message: "材料类型不能为空", trigger: "change" } + ], + itemId: [ + { required: true, message: "物品ID不能为空", trigger: "blur" } + ], + itemType: [ + { required: true, message: "物品类型不能为空", trigger: "change" } + ], + // 净重和毛重 + netWeight: [ + { required: true, message: "净重不能为空", trigger: "blur" } + ], }, buttonLoading: false, loading: false, diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue index cea05bc7..4ac3645c 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -446,6 +446,7 @@ import { PDFDocument } from 'pdf-lib'; import { listUser } from "@/api/system/user"; import AbnormalList from "./abnormal.vue"; import LogTable from "@/views/wms/warehouse/components/LogTable.vue"; +import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint' export default { name: "MaterialCoil", @@ -811,33 +812,8 @@ export default { }, // 打印标签 handlePrintLabel(row) { - const item = row.itemType === 'product' ? row.product : row.rawMaterial; - const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; - const itemType = row.itemType || ''; - const warehouseId = row.warehouseId || ''; - // 在镀锌颜料库的卷使用镀锌原料标签 - if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) { - this.labelRender.type = '5'; - } - // 脱脂原料库 - else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) { - this.labelRender.type = '6'; - } - else if (itemType == 'raw_material') { - this.labelRender.type = '2'; - } else if (itemType == 'product' && itemName == '冷硬卷') { - this.labelRender.type = '3'; - } else if (itemType == 'product' && itemName == '热轧卷板') { - this.labelRender.type = '3'; - } else if (itemType == 'product' && itemName == '镀锌卷') { - this.labelRender.type = '4'; - } else if (itemType == 'product' && itemName == '冷轧卷') { - this.labelRender.type = '3'; - } else if (itemType == 'product' && itemName == '镀铬卷') { - this.labelRender.type = 'ge'; - } else { - this.labelRender.type = '3'; - } + const type = getCoilTagPrintType(row); + this.labelRender.type = type; this.labelRender.data = { ...row, itemName: itemName, diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index 234f6f15..379c2768 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -494,6 +494,7 @@ import RawMaterialInfo from '@/components/KLPService/Renderer/RawMaterialInfo' import { addCoilAbnormal } from '@/api/wms/coilAbnormal' import LabelRender from './LabelRender/index.vue' import StepSplit from './stepSplit.vue' +import { getCoilTagPrintType } from '@/views/wms/coil/js/coilPrint' export default { name: 'DoPage', @@ -715,33 +716,8 @@ export default { parseTime, // 打印标签 handlePrintLabel(row) { - const item = row.itemType === 'product' ? row.product : row.rawMaterial; - const itemName = row.itemType === 'product' ? item?.productName || '' : item?.rawMaterialName || ''; - const itemType = row.itemType || ''; - const warehouseId = row.warehouseId || ''; - // 在镀锌颜料库的卷使用镀锌原料标签 - if (itemType == 'raw_material' && (warehouseId == '1988150263284953089' || warehouseId == '1988150487185289217')) { - this.labelRender.type = '5'; - } - // 脱脂原料库 - else if (itemType == 'raw_material' && (warehouseId == '1988150545175736322')) { - this.labelRender.type = '6'; - } - else if (itemType == 'raw_material') { - this.labelRender.type = '2'; - } else if (itemType == 'product' && itemName == '冷硬卷') { - this.labelRender.type = '3'; - } else if (itemType == 'product' && itemName == '热轧卷板') { - this.labelRender.type = '3'; - } else if (itemType == 'product' && itemName == '镀锌卷') { - this.labelRender.type = '4'; - } else if (itemType == 'product' && itemName == '冷轧卷') { - this.labelRender.type = '3'; - } else if (itemType == 'product' && itemName == '镀铬卷') { - this.labelRender.type = 'ge'; - } else { - this.labelRender.type = '3'; - } + const type = getCoilTagPrintType(row); + this.labelRender.type = type; this.labelRender.data = { ...row, itemName: itemName,