Эх сурвалжийг харах

feat:排产日志改批号

lucky 2 сар өмнө
parent
commit
a87fac5f7d

+ 1 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java

@@ -225,6 +225,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
         BeanUtils.copyProperties(spinning,detailsOfTheRefuelingPlanSpinningLogs);
         detailsOfTheRefuelingPlanSpinningLogs.setCreateBy(SecurityUtils.getUsername());
         detailsOfTheRefuelingPlanSpinningLogs.setCreateById(SecurityUtils.getUserId());
+        detailsOfTheRefuelingPlanSpinningLogs.setCurrentLotNumber(detailsOfTheRefuelingPlanSpinning.getCurrentLotNumber());//批号
         detailsOfTheRefuelingPlanSpinningLogs.setCreateTime(new Date());
         detailsOfTheRefuelingPlanSpinningLogs.setMacId(Long.parseLong(spinning.getMacId()));//机台id
         detailsOfTheRefuelingPlanSpinningLogs.setOrderId(spinning.getSalesmanId());//订单

+ 2 - 2
zkqy-ui/src/views/orderMange/planTable/fangsi.vue

@@ -518,7 +518,7 @@ export default {
         productId:'',
         salesmanId:'',
         isEditing: true, // 标记为正在编辑状态
-        planType: this.$t('planTable.spinningPlan'),
+        planType:"纺丝计划",
         colourNumber:""
       });
       this.editingRowIndex = this.tableData2.length - 1;
@@ -641,7 +641,7 @@ export default {
     },
     // 更新状态
     updateStatus(ind, row){
-      row.planType=this.$t('planTable.spinningPlan')
+      row.planType="纺丝计划"
       if(!this.isRowFilled(row)){
         this.$message({message: this.$t('planTable.completeCurrentRow'), type: 'warning'});
         return;

+ 2 - 2
zkqy-ui/src/views/orderMange/planTable/fankuang.vue

@@ -735,7 +735,7 @@ export default {
         productId:'',
         salesmanId:'',
         isEditing: true,
-        planType: this.$t('planTable.spinningPlan'),
+        planType: "翻框计划",
         colourNumber:""
       });
       this.editingRowIndex = this.tableData2.length - 1; // 更新当前编辑的行索引
@@ -857,7 +857,7 @@ export default {
     },
     // 更新状态
     updateStatus(ind, row,planStatus){
-      row.planType=this.$t('planTable.spinningPlan')
+      row.planType="翻框计划"
       if(!this.isRowFilled(row)){
         this.$message({message: this.$t('planTable.completeCurrentRow'), type: 'warning'});
         return;

+ 0 - 1
zkqy-ui/src/views/orderMange/planTable/index.vue

@@ -578,7 +578,6 @@
               <template v-slot:default="scope">
                 <el-input
                   v-if="scope.row.isEditing"
-                  disabled="disabled"
                   v-model="scope.row.currentLotNumber"
                   placeholder="请输入批号"
                   @blur.stop.prevent="handleInputBlur(scope.row)"

+ 2 - 2
zkqy-ui/src/views/orderMange/planTable/luotong.vue

@@ -731,7 +731,7 @@ export default {
         productId:'',
         salesmanId:'',
         isEditing: true, // 标记为正在编辑状态
-        planType: this.$t('planTable.windingPlan'),
+        planType: "络筒计划",
         colourNumber:"",
       });
       this.editingRowIndex = this.tableData2.length - 1; // 更新当前编辑的行索引
@@ -853,7 +853,7 @@ export default {
     },
     // 更新状态
     updateStatus(ind, row){
-      row.planType = this.$t('planTable.windingPlan')
+      row.planType = "络筒计划"
       if(!this.isRowFilled(row)){
         this.$message({message: this.$t('planTable.completeCurrentRow'), type: 'warning'});
         return;