@@ -326,7 +327,8 @@ import AbnormalForm from './components/AbnormalForm';
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
import { addCoilContractRel } from "@/api/wms/coilContractRel";
import ContractSelect from "@/components/KLPService/ContractSelect";
-import L2MatchPanel from './panels/L2MatchPanel.vue';
+import L2MatchPanel from './panels/L2MatchPanel.vue'
+import DrMatchPanel from './panels/DrMatchPanel.vue';
export default {
@@ -340,6 +342,7 @@ export default {
AbnormalForm,
ContractSelect,
L2MatchPanel,
+ DrMatchPanel,
},
dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'],
data() {
@@ -429,6 +432,7 @@ export default {
],
},
actionId: null,
+ actionType: null, // 待操作类型，504/524 = 双机架
acidPrefill: {
visible: false,
type: 'info',
@@ -462,6 +466,10 @@ export default {
l2HotCoilId() {
return (this.currentInfo && this.currentInfo.enterCoilNo) || ''
},
+ /** 是否双机架工序（actionType 504=正常 / 524=修复） */
+ isDrAction() {
+ return this.actionType === 504 || this.actionType === 524
+ },
// 动态显示标签
getItemLabel() {
if (this.updateForm.materialType === '成品') {
@@ -490,6 +498,11 @@ export default {
// 填写生产开始时间
this.$set(this.updateForm, 'productionStartTime', pendingActionRes.data.createTime)
+ // 记录操作类型（用于判断是否双机架工序）
+ if (pendingActionRes.data && pendingActionRes.data.actionType != null) {
+ this.actionType = pendingActionRes.data.actionType
+ }
+
if (coilId) {
await this.loadCoilInfo(coilId);
}
@@ -523,6 +536,20 @@ export default {
}
},
methods: {
+ /** 双机架计划/道次快捷写入 */
+ applyDrFill(data) {
+ if (data.outThick != null) this.$set(this.updateForm, 'actualThickness', parseFloat(data.outThick))
+ if (data.inMatWidth != null) this.$set(this.updateForm, 'actualWidth', parseFloat(data.inMatWidth))
+ if (data.inMatWeight != null) {
+ this.$set(this.updateForm, 'netWeight', parseFloat(data.inMatWeight))
+ this.$set(this.updateForm, 'grossWeight', parseFloat(data.inMatWeight))
+ }
+ if (data.inMatLength != null) {
+ this.$set(this.updateForm, 'actualLength', parseFloat(data.inMatLength))
+ this.$set(this.updateForm, 'length', parseFloat(data.inMatLength))
+ }
+ },
+
applyL2Fill(data) {
if (data.entry_weight != null) {
const w = parseFloat(data.entry_weight)
diff --git a/klp-ui/src/views/wms/mill/dr-plan.vue b/klp-ui/src/views/wms/mill/dr-plan.vue
new file mode 100644
index 00000000..b3f06c84
--- /dev/null
+++ b/klp-ui/src/views/wms/mill/dr-plan.vue
@@ -0,0 +1,385 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ prodStatusLabel(row.prodStatus) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请在上方选择一条计划
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.reduction }}
+
+
+ {{ row.totalReduction }}
+
+
+
+
+
+
+
+
该计划尚未绑定工艺参数
+
+ 选择已有方案
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 不显示已完成
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+ 新增计划
+ 修改
+ 完成
+ 删除
+ Up 上移
+ Down 下移
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ mm
+
+
+
+
+ mm
+
+
+
+
+ mm
+
+
+
+
+ t
+
+
+
+
+ m
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定
+
+
+
+
+
+
+
+
+
+ 取消
+ 确定绑定
+
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/wms/mill/dr-process.vue b/klp-ui/src/views/wms/mill/dr-process.vue
new file mode 100644
index 00000000..357981d4
--- /dev/null
+++ b/klp-ui/src/views/wms/mill/dr-process.vue
@@ -0,0 +1,461 @@
+
+
+
+
+
+
+
+
+
+
+
+
{{ r.recipeNo }}
+
{{ r.alloyNo }} · {{ r.inThick }}→{{ r.outThick }}mm
+
+ 编辑
+ 删除
+
+
+
暂无方案
+
+
+
+
+
+
+
+
+
+ {{ v.versionCode }}
+ 激活
+ 已发布
+ 草稿
+
+
{{ v.remark }}
+
+ 激活
+ 删除
+
+
+
暂无版本，请新增
+
请先选择方案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.passNo }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ row.reduction }}
+
+
+ {{ row.totalReduction }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ mm
+
+
+ mm
+
+
+ mm
+
+
+
+ 取消
+ 确定
+ 删除
+
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/wms/processSpec/planSpec.vue b/klp-ui/src/views/wms/processSpec/planSpec.vue
index 25035a53..51228f16 100644
--- a/klp-ui/src/views/wms/processSpec/planSpec.vue
+++ b/klp-ui/src/views/wms/processSpec/planSpec.vue
@@ -65,7 +65,7 @@
/>
-
点位名称：
+
参数名称：
新建参数
+ 新建方案点位
+ >管理点位
模板导入