diff --git a/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py b/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py index 21d27fe..0a60f4c 100644 --- a/hb_server/apps/wpm/migrations/0053_auto_20220129_1512.py +++ b/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', diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py index 997e65c..f75908f 100644 --- a/hb_server/apps/wpm/models.py +++ b/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, diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py index dbf50f0..81c18ed 100644 --- a/hb_server/apps/wpm/views.py +++ b/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