From 6b5b5e99117ecadac9d85c3888b1ca00263b31f1 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 31 Dec 2021 16:44:53 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E5=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=BF=94=E5=9B=9Edecision=5F2=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/.env.development    | 4 ++--
 hb_server/apps/wpm/signals.py | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hb_client/.env.development b/hb_client/.env.development
index 003a43c..ef83e12 100644
--- a/hb_client/.env.development
+++ b/hb_client/.env.development
@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
-VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
+VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
+#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
 
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
diff --git a/hb_server/apps/wpm/signals.py b/hb_server/apps/wpm/signals.py
index 670f9c7..9b37b54 100644
--- a/hb_server/apps/wpm/signals.py
+++ b/hb_server/apps/wpm/signals.py
@@ -46,10 +46,10 @@ def handleTicket(sender, instance, created, **kwargs):
             wp = wt.wproduct
             decision = WProduct.NG_BACK_WORK
             
-            if 'decision_1' in ticket_data and ticket_data['decision_1']:
-                decision = ticket_data['decision_1']
-            elif 'decision_2' in ticket_data and ticket_data['decision_2']:
+            if 'decision_2' in ticket_data and ticket_data['decision_2']:
                 decision = ticket_data['decision_2']
+            elif 'decision_1' in ticket_data and ticket_data['decision_1']:
+                decision = ticket_data['decision_1']
 
 
             wp.ng_sign = decision

From 8f1746f8a6be5b5a91138cae759b6b6ff812d72d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 4 Jan 2022 09:22:54 +0800
Subject: [PATCH 2/5] =?UTF-8?q?techdoc=20=E5=A2=9E=E5=8A=A0enabled?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/mtm/filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hb_server/apps/mtm/filters.py b/hb_server/apps/mtm/filters.py
index ca4c2dd..41d7b73 100644
--- a/hb_server/apps/mtm/filters.py
+++ b/hb_server/apps/mtm/filters.py
@@ -9,7 +9,7 @@ class TechDocFilterset(filters.FilterSet):
     # operation = filters.CharFilter(field_name="subproduction__subplan_subprod__ow_subplan__operation")
     class Meta:
         model = TechDoc
-        fields = ['subproduction', 'operation']
+        fields = ['subproduction', 'operation', 'enabled']
 
     def filter_operation(self, queryset, name, value):
         return queryset.filter(subproduction__subplan_subprod__ow_subplan__operation=value).distinct()

From 3b1fefc6962b74ebbd814c40dca60ce58efeefef Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 4 Jan 2022 09:44:39 +0800
Subject: [PATCH 3/5] jianyantianjiaqiyong

---
 hb_client/src/router/index.js              |  2 +-
 hb_client/src/views/mtm/materialdo.vue     | 13 ++++++++++++-
 hb_client/src/views/mtm/productprocess.vue | 18 ++++++++++++------
 hb_client/src/views/wpm/need.vue           |  3 ++-
 hb_client/src/views/wpm/operationdo.vue    |  2 +-
 5 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index e98d1ae..de1ab74 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -343,7 +343,7 @@ export const asyncRoutes = [
         path: 'admissiontest',
         name: 'admissiontest',
         component: () => import('@/views/qm/admissiontest'),
-        meta: { title: '入场检验', icon: 'example', perms: ['index_manage'] }
+        meta: { title: '入厂检验', icon: 'example', perms: ['index_manage'] }
       }
       ,
       {
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index 8792fb0..f6d227f 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -34,6 +34,14 @@
               <el-table-column label="表名称">
                 <template slot-scope="scope">{{ scope.row.name }}</template>
               </el-table-column>
+               <el-table-column label="是否启用">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.enabled==false">否</el-tag>
+            <el-tag v-if="scope.row.enabled==true">是</el-tag>
+                
+                  </template>
+              </el-table-column>
+              
               <el-table-column align="center" label="操作">
                 <template slot-scope="scope">
                   <el-link
@@ -73,6 +81,9 @@
                 <el-form-item label="表格名称" prop="name">
                   <el-input v-model="recordform.name" placeholder="表格名称"/>
                 </el-form-item>
+                   <el-form-item label="是否启用" prop="name">
+                   <el-switch v-model="recordform.enabled"></el-switch>
+                     </el-form-item>
               </el-form>
               <div style="text-align: right">
                 <el-button type="danger" @click="dialogVisible = false"
@@ -546,7 +557,7 @@
     number: "",
   };
 
-  const defaultrecordform = {};
+  const defaultrecordform = {enabled:false};
   const defaultfield = {};
   let preDrawAry = [];
   export default {
diff --git a/hb_client/src/views/mtm/productprocess.vue b/hb_client/src/views/mtm/productprocess.vue
index bf8ea59..96ce2e8 100644
--- a/hb_client/src/views/mtm/productprocess.vue
+++ b/hb_client/src/views/mtm/productprocess.vue
@@ -566,7 +566,13 @@
           <el-table-column label="文件名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-        
+          <el-table-column label="是否启用">
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.enabled==false">否</el-tag>
+            <el-tag v-if="scope.row.enabled==true">是</el-tag>
+                
+                  </template>
+              </el-table-column>
        
       <el-table-column align="center" label="文件">
           <template slot-scope="scope" v-if="scope.row.file_">
@@ -611,12 +617,14 @@
           <el-input v-model="techdoc.name" placeholder="文件名称" />
         </el-form-item>
      
-
+      
        <el-form-item label="内容" prop="content" style="height:350px">
           <quill-editor ref="text" v-model="techdoc.content"  style="height:250px" :options="editorOption" />
        
         </el-form-item>
-        
+          <el-form-item label="是否启用" prop="name">
+                   <el-switch v-model="techdoc.enabled"></el-switch>
+                     </el-form-item>
          <el-form-item label="文件" prop="template" v-if="dialogVisiblet">
           <el-upload
           ref="upload"
@@ -671,9 +679,7 @@ const defaultother = {};
 const defaultusedstep = {
  
 };
-const defaulttechdoc = {
-
-};
+const defaulttechdoc = {enabled:false};
 const defaultsubproducation = {
  
 };
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 4f1a021..ac8d39b 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -955,6 +955,7 @@
         this.wproduct = scope.row.id;//半成品ID
         this.listQueryrecordform.material = scope.row.material_.id;//
         this.listQueryrecordform.type = 2;
+         this.listQueryrecordform.enabled = true;
         this.recordform = null;
         getrecordformList(this.listQueryrecordform).then((response) => {
           if (response.data) {
@@ -1003,7 +1004,7 @@
         that.recordform = scope.row.form;
         that.formName = scope.row.form_.name;
         if(that.innerIndex==='1'){//非复检
-          getrffieldList({form: this.recordform, page: 1, page_size: 100}).then((response) => {
+          getrffieldList({form: this.recordform,enabled:true, page: 1, page_size: 100}).then((response) => {
             if (response.data) {
               that.hasPicture = false;
               let fieldList = response.data.results;
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 40fab23..a698c7d 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -787,7 +787,7 @@ export default {
     },
     //操作自定义表
     getrecordLists() {
-      getrecordList({ operation: this.id, page: 0 }).then((response) => {
+      getrecordList({ operation: this.id, page: 0,enabled:true }).then((response) => {
         if (response.data) {
           this.recordData = response.data;
         }

From 4538c328345fe6f09df19d5ef093b7c8301a81cf Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 4 Jan 2022 16:43:32 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=8B=E6=96=99=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E5=88=9D=E6=AD=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wpm/migrations/0044_auto_20220104_1641.py | 59 +++++++++++++++++++
 hb_server/apps/wpm/models.py                  | 17 ++++--
 hb_server/apps/wpm/serializers.py             |  6 +-
 hb_server/apps/wpm/services.py                | 39 ++++++------
 hb_server/apps/wpm/views.py                   | 36 +++++++----
 5 files changed, 116 insertions(+), 41 deletions(-)
 create mode 100644 hb_server/apps/wpm/migrations/0044_auto_20220104_1641.py

diff --git a/hb_server/apps/wpm/migrations/0044_auto_20220104_1641.py b/hb_server/apps/wpm/migrations/0044_auto_20220104_1641.py
new file mode 100644
index 0000000..d507775
--- /dev/null
+++ b/hb_server/apps/wpm/migrations/0044_auto_20220104_1641.py
@@ -0,0 +1,59 @@
+# Generated by Django 3.2.9 on 2022-01-04 08:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mtm', '0042_alter_recordformfield_field_type'),
+        ('wpm', '0043_auto_20211231_1130'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='operation',
+            name='use_scrap',
+        ),
+        migrations.AddField(
+            model_name='operationmaterial',
+            name='from_batch',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='源批次'),
+        ),
+        migrations.AddField(
+            model_name='operationmaterial',
+            name='from_material',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='om_fmaterial', to='mtm.material', verbose_name='源物料'),
+        ),
+        migrations.AddField(
+            model_name='operationmaterial',
+            name='use_scrap',
+            field=models.BooleanField(default=False, verbose_name='是否使用的边角料'),
+        ),
+        migrations.AddField(
+            model_name='operationwproduct',
+            name='ng_sign',
+            field=models.PositiveSmallIntegerField(blank=True, choices=[(10, '返工'), (20, '返修'), (30, '报废'), (40, '让步接收'), (50, '偏离许可'), (60, '降级使用'), (70, '退回供方'), (80, '召回')], null=True, verbose_name='当时的不合格标记'),
+        ),
+        migrations.AddField(
+            model_name='wproduct',
+            name='coperation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wp_coperation', to='wpm.operation', verbose_name='创建所关联操作'),
+        ),
+        migrations.AddField(
+            model_name='wproductflow',
+            name='coperation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wpf_coperation', to='wpm.operation', verbose_name='创建所关联操作'),
+        ),
+        migrations.AlterField(
+            model_name='operationmaterial',
+            name='material',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='om_material', to='mtm.material', verbose_name='可能产出的产品'),
+        ),
+        migrations.AlterField(
+            model_name='wproductflow',
+            name='operation',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='wpf_operation', to='wpm.operation', verbose_name='当前操作'),
+        ),
+    ]
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index 1bac267..a01de96 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -96,6 +96,8 @@ class WProduct(CommonAModel):
     warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
     operation = models.ForeignKey('wpm.operation', verbose_name='当前操作', 
         on_delete=models.SET_NULL, null=True, blank=True, related_name='wp_operation')
+    coperation = models.ForeignKey('wpm.operation', verbose_name='创建所关联操作', 
+        on_delete=models.SET_NULL, null=True, blank=True, related_name='wp_coperation')
     test = models.ForeignKey('qm.testrecord', verbose_name='当前检验', 
         on_delete=models.SET_NULL, null=True, blank=True, related_name='wp_test')
     ticket = models.ForeignKey('wf.ticket', verbose_name='当前工单', 
@@ -144,7 +146,9 @@ class WproductFlow(CommonAModel):
 
     warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
     operation = models.ForeignKey('wpm.operation', verbose_name='当前操作', 
-        on_delete=models.SET_NULL, null=True, blank=True)
+        on_delete=models.SET_NULL, null=True, blank=True, related_name='wpf_operation')
+    coperation = models.ForeignKey('wpm.operation', verbose_name='创建所关联操作', 
+        on_delete=models.SET_NULL, null=True, blank=True, related_name='wpf_coperation')
     test = models.ForeignKey('qm.testrecord', verbose_name='当前检验', 
         on_delete=models.SET_NULL, null=True, blank=True)
     ticket = models.ForeignKey('wf.ticket', verbose_name='当前工单', 
@@ -183,7 +187,6 @@ class Operation(CommonADModel):
     生产操作
     """
     step = models.ForeignKey(Step, verbose_name='操作步骤', on_delete=models.CASCADE, null=True, blank=True)
-    use_scrap = models.BooleanField('是否使用的边角料', default=False)
     remark = models.CharField('操作备注', max_length=200, null=True, blank=True)
     is_submited = models.BooleanField('是否提交', default=False)
 
@@ -196,7 +199,7 @@ class OperationWproduct(BaseModel):
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
     material = models.ForeignKey(Material, verbose_name='操作时的物料状态', on_delete=models.CASCADE)
     subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE, related_name='ow_subplan')
-    
+    ng_sign = models.PositiveSmallIntegerField('当时的不合格标记', choices= WProduct.ng_choices, null=True, blank=True)
     class Meta:
         unique_together = (
             ('operation','wproduct')
@@ -209,7 +212,8 @@ class OperationMaterial(BaseModel):
     type = models.IntegerField('类型', default=0, choices=SubprodctionMaterial.type_choices)
     operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE)
     
-    material = models.ForeignKey(Material, verbose_name='可能产出的产品', on_delete=models.CASCADE, null=True, blank=True)
+    material = models.ForeignKey(Material, verbose_name='可能产出的产品', on_delete=models.CASCADE, 
+                null=True, blank=True, related_name='om_material')
     count = models.PositiveSmallIntegerField('消耗或产出数量', null=True, blank=True)
 
     wmaterial = models.ForeignKey(WMaterial, verbose_name='关联的车间物料', on_delete=models.CASCADE, null=True, blank=True)
@@ -217,8 +221,12 @@ class OperationMaterial(BaseModel):
 
     subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联的子计划', on_delete=models.CASCADE, null=True, blank=True)
     batch = models.CharField('批次号', max_length=100, null=True, blank=True)
+    use_scrap = models.BooleanField('是否使用的边角料', default=False)
 
     #以下为冷加工下料清单所用字段
+    from_material = models.ForeignKey(Material, verbose_name='源物料', on_delete=models.CASCADE, 
+                null=True, blank=True, related_name='om_fmaterial')
+    from_batch = models.CharField('源批次', max_length=100, null=True, blank=True)
     count_cut = models.PositiveIntegerField('切裁片数', default=0)
     count_real = models.PositiveIntegerField('生产片数', default=0)
     count_ok = models.PositiveIntegerField('成品数量', default=0)
@@ -226,6 +234,7 @@ class OperationMaterial(BaseModel):
     count_podian = models.PositiveIntegerField('破点甩片', default=0)
     count_hua = models.PositiveIntegerField('划伤甩片', default=0)
     count_other = models.PositiveIntegerField('其他甩片', default=0)
+    
     class Meta:
         unique_together = (
             ('operation','material', 'batch')
diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py
index dcef7f8..b5d168c 100644
--- a/hb_server/apps/wpm/serializers.py
+++ b/hb_server/apps/wpm/serializers.py
@@ -350,7 +350,7 @@ class OperationMaterialCreate1Serailizer(serializers.ModelSerializer):
     wmaterial = serializers.PrimaryKeyRelatedField(required=True, queryset=WMaterial.objects.all())
     class Meta:
         model = OperationMaterial
-        fields = ['operation', 'wmaterial', 'count']
+        fields = ['operation', 'wmaterial', 'count', 'use_scrap']
     
     def validate(self, attrs):
         if attrs['count'] <=0:
@@ -376,7 +376,7 @@ class OperationMaterialCreate2Serailizer(serializers.ModelSerializer):
     subproduction_progress = serializers.PrimaryKeyRelatedField(required=True, queryset=SubProductionProgress.objects.all())
     class Meta:
         model = OperationMaterial
-        fields = ['operation', 'subproduction_progress', 'count']
+        fields = ['operation', 'subproduction_progress', 'count', 'use_scrap']
     
     def create(self, validated_data):
         subproduction_progress = validated_data['subproduction_progress']
@@ -448,7 +448,7 @@ class WproductTicketListSerializer(serializers.ModelSerializer):
 
 class CuttingListSerializer(serializers.ModelSerializer):
     subproduction_plan_ = SubproductionPlanSimpleSerializer(source='subproduction_plan', read_only=True)
-    material_ = MaterialSimpleSerializer(source='material', read_only=True)
+    from_material_ = MaterialSimpleSerializer(source='from_material', read_only=True)
     create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
     class Meta:
         model = OperationMaterial
diff --git a/hb_server/apps/wpm/services.py b/hb_server/apps/wpm/services.py
index d565482..76ab0fd 100644
--- a/hb_server/apps/wpm/services.py
+++ b/hb_server/apps/wpm/services.py
@@ -154,28 +154,23 @@ class WpmServies(object):
         """
         inputs = OperationMaterial.objects.filter(operation=op, type=SubprodctionMaterial.SUB_MA_TYPE_IN)
         outputs = OperationMaterial.objects.filter(operation=op, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
-        for i in inputs:
-            sp = i.subproduction_plan
-            i.count_cut = outputs.filter(subproduction_plan=sp).first().count
-            i.count_real = sp.count_real
-            i.count_ok = sp.count_ok
-            wpfs = WproductFlow.objects.filter(subproduction_plan=sp, is_lastlog=True)
-            i.count_qipao = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_QIPAO).count()
-            i.count_podian = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_PODIAN).count()
-            i.count_hua = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_HUA).count()
-            i.count_other = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_OTHER).count()
-            i.is_cutting = True
-            i.save()
-
-    @classmethod
-    def update_cutting_list_with_sp(cls, sp:SubProductionPlan):
-        """
-        根据子计划更新下料清单
-        """
-        wpfs = WproductFlow.objects.filter(subproduction_plan=sp, is_lastlog=True)
-        for i in OperationMaterial.objects.filter(subproduction_plan=sp, is_cutting=True):
-            i.count_real = sp.count_real
-            i.count_ok = sp.count_ok
+        for i in outputs:
+            if i.use_scrap: # 如果使用了边角料
+                i.count_cut = 0
+                i.from_material = SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN,
+                    subproduction__subplan_subprod=i.subproduction_plan).first().material
+            else:
+                input_q = inputs.filter(subproduction_plan=i.subproduction_plan) # 同计划的消耗
+                i.from_material = input_q.first().matrial
+                count_cut = 0
+                from_batch = ''
+                for m in input_q:
+                    count_cut = count_cut + m.count
+                    from_batch = from_batch + ';' + m.batch if m.batch else from_batch
+            wpfs = WproductFlow.objects.filter(subproduction_plan=i.subproduction_plan, 
+                is_lastlog=True, coperation=op)# 筛选本次操作下子计划的产品日志
+            i.count_real = wpfs.count()
+            i.count_ok = wpfs.exclude(scrap_reason=None).count()
             i.count_qipao = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_QIPAO).count()
             i.count_podian = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_PODIAN).count()
             i.count_hua = wpfs.filter(scrap_reason=WProduct.SCRAP_REASON_HUA).count()
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 2a47bca..464f0bd 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -386,7 +386,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
         obj.save()
         WpmServies.add_wproduct_flow_log(obj, 'scrap')
         if obj.step.process.id == 1: #如果是冷加工
-            WpmServies.update_cutting_list_with_sp(obj.subproduction_plan)
+            WpmServies.update_cutting_list_with_operation(obj.coperation)
         return Response()
 
     # @action(methods=['get'], detail=False, perms_map={'get':'*'})
@@ -510,12 +510,13 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 owp['number'] = wpd.number
                 owp['material'] = wpd.material
                 owp['subproduction_plan'] = wpd.subproduction_plan
+                owp['ng_sign'] = wpd.ng_sign
                 owps.append(OperationWproduct(**owp))
             OperationWproduct.objects.bulk_create(owps)
         else:
             splans = WpmServies.get_subplans_queryset_from_wproducts(vdata['wproducts'])
         # 查询需要填写的自定义表格
-        forms = RecordForm.objects.filter(step=step, type=RecordForm.RF_TYPE_DO)
+        forms = RecordForm.objects.filter(step=step, type=RecordForm.RF_TYPE_DO, enabled=True)
         for i in forms:
             opr = OperationRecord()
             opr.operation = op
@@ -555,11 +556,22 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         step = op.step
         if op.is_submited:
             raise exceptions.APIException('该操作已提交')
+        # 校验消耗产出是否正确填写
+        omis = OperationMaterial.objects.filter(operation=op, 
+                type=SubprodctionMaterial.SUB_MA_TYPE_IN)
+        sps_omi_l = omis.values_list('subproduction_plan', flat=True)
+        omos = OperationMaterial.objects.filter(operation=op, 
+                type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
+        sps_omo_l = omos.filter(use_scrap=False).values_list('subproduction_plan', flat=True)
+        if set(list(sps_omi_l)) == set(list(sps_omo_l)):
+            pass
+        else:
+            raise exceptions.APIException('消耗与产出不一致')
         # 检查自定义表单填写
         if OperationRecord.objects.filter(operation=op, is_filled=False).exists():
             raise exceptions.APIException('存在自定义表单未填写')
         # 更新物料消耗进度
-        for i in OperationMaterial.objects.filter(operation=op, type=SubprodctionMaterial.SUB_MA_TYPE_IN):
+        for i in omis:
             # 更新车间物料
             i_wmat = i.wmaterial
             i_wmat.count = i_wmat.count- i.count
@@ -570,7 +582,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
             spp.count_real = spp.count_real + i.count
             spp.save()
         # 更新产出
-        for i in OperationMaterial.objects.filter(operation=op, type=SubprodctionMaterial.SUB_MA_TYPE_OUT):
+        for i in omos:
             if not i.subproduction_progress.is_main:
                 # 更新车间物料产出情况
                 ins, _ = WMaterial.objects.get_or_create(subproduction_plan=i.subproduction_plan, material=i.material)
@@ -607,24 +619,23 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
 
         elif step.type == Step.STEP_TYPE_DIV:
             # 更新物料产出情况
-            outputs = OperationMaterial.objects.filter(operation=op, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
-            if not outputs.exists():
+            if not omos.exists():
                 raise exceptions.APIException('请选择物料产出')
-            for i in outputs:
+            for i in omos:
                 if i.subproduction_progress.is_main:
                     newstep, _ = WpmServies.get_next_step(i.subproduction_plan, step)
                     wpr = dict(material=i.material, step=newstep,
                         act_state=WProduct.WPR_ACT_STATE_DOWAIT, remark='', 
-                        subproduction_plan=i.subproduction_plan, create_by=request.user)
+                        subproduction_plan=i.subproduction_plan, 
+                        create_by=request.user, coperation=op)
                     for x in range(i.count):
                         ins = WProduct.objects.create(**wpr)
                         # 添加日志
-                        WpmServies.add_wproduct_flow_log(ins, 'operation_submit')
+                        WpmServies.add_wproduct_flow_log(ins, 'wproduct_create')
                     # 更新进度
                     WpmServies.update_subproduction_progress_main(sp=i.subproduction_plan)              
         elif step.type == Step.STEP_TYPE_COMB:
-            oms_w = OperationMaterial.objects.filter(operation=op, type=SubprodctionMaterial.SUB_MA_TYPE_OUT, 
-                subproduction_progress__is_main=True)
+            oms_w = omos.filter(subproduction_progress__is_main=True)
             if len(oms_w) == 1:
                 oms_w = oms_w[0]
                 # 校验单片数量是否正确, 暂时未写
@@ -640,8 +651,9 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                     # 更新子计划进度
                     WpmServies.update_subproduction_progress_main(sp=oms_w.subproduction_plan)
                 wproduct.create_by = request.user
+                wproduct.coperation = op
                 wproduct.save()
-                WpmServies.add_wproduct_flow_log(wproduct, 'operation_submit')
+                WpmServies.add_wproduct_flow_log(wproduct, 'wproduct_create')
                 # 隐藏原半成品
                 wps = WProduct.objects.filter(ow_wproduct__operation = op)
                 wps.update(is_hidden=True, child=wproduct, update_by=request.user, update_time=timezone.now())

From bf711ec9c23f791831d1eb0e6798c20e97115dd7 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 4 Jan 2022 16:50:37 +0800
Subject: [PATCH 5/5] update_cutting_list_with_operation bug

---
 hb_server/apps/wpm/services.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hb_server/apps/wpm/services.py b/hb_server/apps/wpm/services.py
index 76ab0fd..72fbd10 100644
--- a/hb_server/apps/wpm/services.py
+++ b/hb_server/apps/wpm/services.py
@@ -161,7 +161,7 @@ class WpmServies(object):
                     subproduction__subplan_subprod=i.subproduction_plan).first().material
             else:
                 input_q = inputs.filter(subproduction_plan=i.subproduction_plan) # 同计划的消耗
-                i.from_material = input_q.first().matrial
+                i.from_material = input_q.first().material
                 count_cut = 0
                 from_batch = ''
                 for m in input_q: