diff --git a/klp-ui/src/views/wms/coil/do/correct.vue b/klp-ui/src/views/wms/coil/do/correct.vue index 80b32792..f0bd5897 100644 --- a/klp-ui/src/views/wms/coil/do/correct.vue +++ b/klp-ui/src/views/wms/coil/do/correct.vue @@ -40,7 +40,8 @@
{{ item.currentCoilNo }} - {{ getTypeLabel(item) }} + {{ + getTypeLabel(item) }} {{ item.materialType || '原料' }} @@ -130,6 +131,18 @@ 净重: {{ item.netWeight }}t
+
+ 长度: + {{ item.length }} +
+
+ 调制度: + {{ item.temperGrade }} +
+
+ 镀层种类: + {{ item.coatingType }} +
班组: {{ item.team }} @@ -180,8 +193,10 @@ {{ item.netWeight || '—' }}t
- 回滚 + 回滚
-
- 编号: - {{ item.rawMaterial.rawMaterialCode }} -
规格: {{ item.rawMaterial.specification }}
- -
- 厚度: - {{ item.rawMaterial.thickness }}mm -
-
- 宽度: - {{ item.rawMaterial.width }}mm -
-
- 编号: - {{ item.product.productCode }} -
规格: {{ item.product.specification }}
-
- 厚度: - {{ item.product.thickness }}mm -
-
- 宽度: - {{ item.product.width }}mm -
@@ -217,6 +199,18 @@ 净重: {{ item.netWeight }}t
+
+ 长度: + {{ item.length }}mm +
+
+ 调制度: + {{ item.temperGrade }} +
+
+ 镀层种类: + {{ item.coatingType }} +
班组: {{ item.team }} diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue index 0ba03768..06c7a6c8 100644 --- a/klp-ui/src/views/wms/coil/do/ship.vue +++ b/klp-ui/src/views/wms/coil/do/ship.vue @@ -117,6 +117,16 @@ + + + + + + + + + + diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 3759be4d..8034f03e 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -62,15 +62,6 @@ - @@ -112,6 +103,21 @@ + + + + + + + + + + + + + + + @@ -201,8 +207,7 @@ @click="openReceiptModal(scope.row)" v-loading="buttonLoading">签收 拒签 - 删除 + 删除 @@ -283,15 +288,6 @@ - @@ -325,6 +321,12 @@ + + + + + + @@ -383,6 +385,9 @@ export default { packingStatus: null, packagingRequirement: null, planId: null, + length: null, + temperGrade: null, + coatingType: null, }, loading: false, buttonLoading: false, @@ -621,6 +626,9 @@ export default { packingStatus: null, packagingRequirement: null, planId: this.form.planId, + length: null, + temperGrade: null, + coatingType: null, } this.getMaxCoilNoByPrefix() this.getList() @@ -630,7 +638,6 @@ export default { } }) }, - // 打开收货弹窗 openReceiptModal(row) { this.loading = true diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 2e41740c..09495427 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -188,19 +188,21 @@ + + + + + + -
-
+
@@ -255,6 +257,8 @@ export default { packingStatus: '', trimmingRequirement: '', length: null, + temperGrade: '', + coatingType: '', }, 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 a8ca0940..243be7ae 100644 --- a/klp-ui/src/views/wms/coil/panels/base.vue +++ b/klp-ui/src/views/wms/coil/panels/base.vue @@ -250,6 +250,12 @@ + + + + + + @@ -401,20 +407,6 @@ export default { }, data() { return { - qualityStatusEnum: [ - { label: 'A+', value: 'A+' }, - { label: 'A', value: 'A' }, - { label: 'A-', value: 'A-' }, - { label: 'B+', value: 'B+' }, - { label: 'B', value: 'B' }, - { label: 'B-', value: 'B-' }, - { label: 'C+', value: 'C+' }, - { label: 'C', value: 'C' }, - { label: 'C-', value: 'C-' }, - { label: 'D+', value: 'D+' }, - { label: 'D', value: 'D' }, - { label: 'D-', value: 'D-' }, - ], // 按钮loading buttonLoading: false, // 遮罩层 @@ -568,6 +560,8 @@ export default { { label: '切边要求', prop: 'edgeRequirement' }, { label: '包装要求', prop: 'packagingRequirement' }, { label: '厂家', prop: 'itemManufacturer' }, + { label: '调制度', prop: 'temperGrade' }, + { label: '镀层种类', prop: 'coatingType' } ], title: '详细信息' }, @@ -738,6 +732,8 @@ export default { updateTime: undefined, updateBy: undefined, materialType: '原料', + temperGrade: undefined, + coatingType: undefined, }; this.resetForm("form"); }, diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue index 2a7e5880..92e2c358 100644 --- a/klp-ui/src/views/wms/coil/panels/do.vue +++ b/klp-ui/src/views/wms/coil/panels/do.vue @@ -131,6 +131,18 @@ 净重: {{ item.netWeight }}t +
+ 长度: + {{ item.length }}米 +
+
+ 调制度: + {{ item.temperGrade }} +
+
+ 镀层种类: + {{ item.coatingType }} +
班组: {{ item.team }} diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue new file mode 100644 index 00000000..231bedc1 --- /dev/null +++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue @@ -0,0 +1,54 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue index 2b014282..2932e1bd 100644 --- a/klp-ui/src/views/wms/coil/split.vue +++ b/klp-ui/src/views/wms/coil/split.vue @@ -53,6 +53,14 @@ 长度: {{ motherCoil.length ? motherCoil.length + ' m' : '—' }}
+
+ 调制度: + {{ motherCoil.temperGrade || '—' }} +
+
+ 镀层种类: + {{ motherCoil.coatingType || '—' }} +
物料名称: {{ motherCoil.materialName || motherCoil.productName || '—' }} @@ -184,6 +192,12 @@ + + + + + + @@ -255,6 +269,8 @@ export default { warehouseId: null, actualWarehouseId: null, length: undefined, + temperGrade: '', + coatingType: '', } ], loading: false, @@ -436,7 +452,9 @@ export default { qualityStatus: '', packagingRequirement: '', packingStatus: '', - trimmingRequirement: '' + trimmingRequirement: '', + temperGrade: '', + coatingType: '', }); }, diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue index 7bf53bd9..fa51fa68 100644 --- a/klp-ui/src/views/wms/coil/typing.vue +++ b/klp-ui/src/views/wms/coil/typing.vue @@ -54,6 +54,18 @@ 净重: {{ currentInfo.netWeight ? currentInfo.netWeight + ' t' : '—' }}
+
+ 长度: + {{ currentInfo.length ? currentInfo.length + ' m' : '—' }} +
+
+ 调制度: + {{ currentInfo.temperGrade || '—' }} +
+
+ 镀层种类: + {{ currentInfo.coatingType || '—' }} +
逻辑库区: {{ currentInfo.nextWarehouseName || '—' }} @@ -162,6 +174,14 @@ + + + + + + + +