zuoyezhidaoshu

hb_client/src/api/mtm.js

@@ -272,6 +272,13 @@ export function createUsedstep(data) {
     data
   })
 }
+export function updateUsedstep(id,data) {
+  return request({
+    url: `/mtm/usedstep/${id}/`,
+    method: 'put',
+    data
+  })
+}
 export function deleteUsedstep(id, data) {
   return request({
     url: `/mtm/usedstep/${id}/`,

hb_client/src/components/customForm/index.vue

@@ -196,10 +196,6 @@
       isDisabled:{
         type:Boolean,
         default:false
-      },
-      isMidTesting:{
-        type:Boolean,
-        default:false
       }
     },
     mounted() {
@@ -235,13 +231,11 @@
       let listJudge = this.formData.filter(item => {
         return item.need_judge === true;
       });
-      debugger;
       listJudge.forEach(item => {
         let obj = new Object();
         obj = item;
         that.judgeList.push(obj)
       });
-      debugger;
       let  imag= this.formData.filter(item => {
         return item.field_type === 'draw';
       });
@@ -727,7 +721,7 @@
         that.testrecord.record_data = that.field;//检查项列表
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;//记录id
-        if(submit&&that.isMidTesting!==true){//提交
+        if(submit){//提交
           this.$emit('recordSubmit',that.testrecord);
         }else {//保存
           this.$emit('recordSave',that.testrecord);

hb_client/src/components/customForm/review.vue

@@ -818,7 +818,8 @@
         that.testrecord.is_testok = that.is_testok;//检查表检查结果
         that.testrecord.id = that.recordId;
         // debugger;
-        if(submit&&that.isMidTesting!==true){//提交
+        // if(submit&&that.isMidTesting!==true){//提交
+        if(submit){//提交
           this.$emit('recordSubmit',that.testrecord);
         }else {//保存
           this.$emit('recordSave',that.testrecord);

hb_client/src/views/wpm/need.vue

@@ -1011,7 +1011,9 @@
         this.innerIndex = index;
         // this.outerVisible = true;
         this.wproduct = scope.row.id;//半成品ID
-        this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material_.id;//
+        debugger;
+        console.log(scope.row.material_check);
+        this.listQueryrecordform.material = scope.row.material_check!==null ? scope.row.material_check :scope.row.material;//
         this.listQueryrecordform.type = 2;
          this.listQueryrecordform.enabled = true;
         this.recordform = null;

hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py

@@ -12,16 +12,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AddField(
-            model_name='wproduct',
-            name='material_check',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='wp_material_check', to='mtm.material', verbose_name='按物料状态检查'),
-        ),
-        migrations.AddField(
-            model_name='wproductflow',
-            name='material_check',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='wpf_material_check', to='mtm.material', verbose_name='按物料状态检查'),
-        ),
         migrations.AlterField(
             model_name='wproduct',
             name='child',

hb_server/apps/wpm/models.py

@@ -91,9 +91,6 @@ class WProduct(CommonAModel):
     material = models.ForeignKey(
         Material, verbose_name='所属物料状态', on_delete=models.CASCADE,
         related_name='wp_material')
-    material_check = models.ForeignKey(
-        Material, verbose_name='按物料状态检查', on_delete=models.CASCADE,
-        null=True, blank=True, related_name='wp_material_check')
     pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True,
                                  on_delete=models.CASCADE, related_name='wp_pre_step')
     step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True,
@@ -170,9 +167,6 @@ class WproductFlow(CommonAModel):
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
     material = models.ForeignKey(
         Material, verbose_name='所属物料状态', on_delete=models.CASCADE, related_name='wpf_material')
-    material_check = models.ForeignKey(
-        Material, verbose_name='按物料状态检查', on_delete=models.CASCADE,
-        null=True, blank=True, related_name='wpf_material_check')
     pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True,
                                  on_delete=models.CASCADE, related_name='wpf_pre_step')
     step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True,

hb_server/apps/wpm/views.py

@@ -684,10 +684,10 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 newstep, needTest = WpmService.get_next_step(wsp, step)
                 wp.step = newstep
                 wp.pre_step = step
+                wp.material = wsp.product
 
                 if step == newstep:
                     wp.act_state = WProduct.WPR_ACT_STATE_TOTEST
-                    wp.material = wsp.product
                     if wp.test:# 如果有正在进行的工序中检验
                         wp.test.is_midtesting = False
                         wp.test.is_submited = False
@@ -696,7 +696,6 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                     wp.act_state = WProduct.WPR_ACT_STATE_DOWAIT
                     if needTest:
                         wp.act_state = WProduct.WPR_ACT_STATE_TOTEST
-                        wp.material_check = wsp.product
                     
                 wp.operation = None
                 wp.update_by = request.user