From a52d9e2b9c25ecbe20b9223b22632aabf32a3f1d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Jan 2022 16:12:07 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=B6=88=E8=80=97?=
 =?UTF-8?q?=E4=BA=A7=E5=87=BA=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wpm/views.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 36f424b..64555b9 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -610,14 +610,16 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         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 not (set(list(sps_omi_l)) == set(list(sps_omo_l)) and op.step.type == Step.STEP_TYPE_DIV):
-            raise exceptions.APIException('消耗与产出不一致')
+        if op.step.type == Step.STEP_TYPE_DIV:
+            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))
+                raise exceptions.APIException('消耗与产出不一致')
+            
         # 实际消耗物料校验
 
         # 检查自定义表单填写

From 6ff8b117c06c047e6863a3d100de095c9ce292c8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Jan 2022 16:15:30 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 64555b9..8076e8f 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -617,7 +617,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
             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))
+            if set(list(sps_omi_l)) != set(list(sps_omo_l)):
                 raise exceptions.APIException('消耗与产出不一致')
             
         # 实际消耗物料校验

From eb4cdf5d2b33b8280691dfc8ce4be42e56c38199 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Jan 2022 16:21:27 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wpm/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 8076e8f..8aee33d 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -609,13 +609,13 @@ 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)
+        omos = OperationMaterial.objects.filter(operation=op, 
+                    type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
         # 校验消耗产出是否正确填写
         if op.step.type == Step.STEP_TYPE_DIV:
-            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)):
                 raise exceptions.APIException('消耗与产出不一致')

From ddfe73366443278bf02fd3097e122008418e93b3 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 13 Jan 2022 16:42:26 +0800
Subject: [PATCH 04/15] changes

---
 .../components/Gantt/components/leftMenu.vue  |  14 +-
 .../components/Gantt/components/slider.vue    |  21 +-
 hb_client/src/components/customForm/index.vue |  20 +-
 .../src/components/customForm/review.vue      |  37 +-
 .../src/components/faceLogin/faceLogin.vue    |  43 +-
 .../src/layout/components/TagsView/index.vue  |   2 +-
 hb_client/src/views/dashboard/index.vue       | 208 +++++--
 hb_client/src/views/mtm/material.vue          | 529 +++++++++---------
 hb_client/src/views/mtm/materialdo.vue        | 137 +++--
 hb_client/src/views/pm/plan.vue               | 106 ++--
 10 files changed, 622 insertions(+), 495 deletions(-)

diff --git a/hb_client/src/components/Gantt/components/leftMenu.vue b/hb_client/src/components/Gantt/components/leftMenu.vue
index 7ba7927..632bcef 100644
--- a/hb_client/src/components/Gantt/components/leftMenu.vue
+++ b/hb_client/src/components/Gantt/components/leftMenu.vue
@@ -19,19 +19,13 @@
       @expand-change="handlerExpand"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column label="任务编号" width="150">
-        <template slot-scope="scope">{{ scope.row.name }}</template>
+      <el-table-column label="任务编号" prop="name">
       </el-table-column>
-      <el-table-column label="产品名称">
-        <template slot-scope="scope">
-          <div style="overflow: hidden; text-overflow:ellipsis; white-space: nowrap;">{{ scope.row.productName }}</div>
-        </template>
+      <el-table-column label="产品名称" prop="productName" width="120" show-overflow-tooltip>
       </el-table-column>
-      <el-table-column label="产品型号">
-        <template slot-scope="scope">{{ scope.row.productNum }}</template>
+      <el-table-column label="产品型号" prop="productNum">
       </el-table-column>
-      <el-table-column label="生产数量">
-        <template slot-scope="scope">{{ scope.row.per }}</template>
+      <el-table-column label="生产数量" prop="per">
       </el-table-column>
     </el-table>
   </div>
diff --git a/hb_client/src/components/Gantt/components/slider.vue b/hb_client/src/components/Gantt/components/slider.vue
index b355b75..acba620 100644
--- a/hb_client/src/components/Gantt/components/slider.vue
+++ b/hb_client/src/components/Gantt/components/slider.vue
@@ -1,19 +1,18 @@
 <template>
   <div
-    class="slider"
     ref="slider"
+    class="slider"
   >
     <div
       class="process"
       :style="{ width }"
-      style="font-size: 12px;color: #ffffff;text-align: right"
     >
       <span v-if="per">{{ per }}</span>
       <span v-else>{{ per }}</span>
     </div>
-    <div class="process1"
-         :style="{width:process1Width}"
-         style="font-size: 12px;color: #ffffff;text-align: right"
+    <div
+      class="process1"
+      :style="{width:process1Width}"
     >
       <span v-if="per1"> {{ per1 }}</span>
     </div>
@@ -122,6 +121,10 @@ export default {
   top: 0;
   width: 112px;
   height: 20px;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: right;
+  line-height: 20px;
   border-radius: 3px;
   background: #409eff;
 }
@@ -131,10 +134,16 @@ export default {
   top: 0;
   width: 10px;
   height: 20px;
+  font-size: 12px;
+  color: #ffffff;
+  text-align: right;
+  line-height: 20px;
   border-radius: 3px;
   background: #11c750;
 }
-
+.slider .process span{
+  margin-right: 5px;
+}
 
 .slider .block i {
   font-size: 25px;
diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index b2df560..8aa5314 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@@ -29,10 +29,12 @@
             v-else-if="item.field_type === 'int'"
             :label="item.field_name"
           >
-            <el-input
+            <el-input-number
+              style="width: 100%;"
               v-model="checkForm[item.field_key]"
-              type="number"
+              step-strictly
               placeholder="请输入"
+              :min="0"
               @input="keyChange($index,item.field_key)"
             />
           </el-form-item>
@@ -40,9 +42,11 @@
             v-else-if="item.field_type === 'float'"
             :label="item.field_name"
           >
-            <el-input
+            <el-input-number
+              style="width: 100%;"
               v-model="checkForm[item.field_key]"
-              type="number"
+              :precision="2"
+              :step="0.1"
               placeholder="请输入"
               @input="keyChange($index,item.field_key)"
             />
@@ -120,8 +124,8 @@
       <el-row v-show="hasPicture">
         <el-form-item label="图表">
           <div>
-            <!--<img id="canvasImg" :src="img" style="width:500px;height: 300px;display: none">-->
-            <img id="canvasImg" src="./../../assets/glass.png" style="width:500px;height: 300px;display: none">
+            <img id="canvasImg" :src="img" style="width:500px;height: 300px;display: none">
+            <!--<img id="canvasImg" src="./../../assets/glass.png" style="width:500px;height: 300px;display: none">-->
             <div style="position: relative;display: flex;flex-direction: column;
                  border: 1px solid #DCDFE6;">
               <canvas id="canvas" width="500" height="300">
@@ -229,9 +233,9 @@
       let  imag= this.formData.filter(item => {
         return item.field_type === 'draw';
       });
-     /* that.img = new Image();
+      that.img = new Image();
       that.img.crossOrigin = '';
-      that.img = 'http://47.95.0.242:2222'+imag[0].draw_template;*/
+      that.img = 'http://47.95.0.242:2222'+imag[0].draw_template;
       setTimeout(function(){
         that.canvasInit();
       },500);
diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue
index ef38722..342cb79 100644
--- a/hb_client/src/components/customForm/review.vue
+++ b/hb_client/src/components/customForm/review.vue
@@ -45,11 +45,12 @@
               placeholder="请输入"
               @input="keyChange($index,item.field_key)"
             />
-            <el-input
+            <el-input-number
               class="halfWidth"
               v-model="checkForm[item.field_key]"
-              type="number"
+              step-strictly
               placeholder="请输入"
+              :min="0"
               @input="keyChange($index,item.field_key)"
             />
           </el-form-item>
@@ -65,13 +66,21 @@
               placeholder="请输入"
               @input="keyChange($index,item.field_key)"
             />
-            <el-input
+            <el-input-number
+              class="halfWidth"
+              v-model="checkForm[item.field_key]"
+              :precision="2"
+              :step="0.1"
+              placeholder="请输入"
+              @input="keyChange($index,item.field_key)"
+            />
+           <!-- <el-input
               class="halfWidth"
               v-model="checkForm[item.field_key]"
               type="number"
               placeholder="请输入"
               @input="keyChange($index,item.field_key)"
-            />
+            />-->
           </el-form-item>
           <el-form-item
             v-else-if="item.field_type === 'date'"
@@ -300,25 +309,15 @@
         obj = item;
         that.judgeList.push(obj)
       });
-      //原始表的数据
-      /*for(let i=0;i<this.origins.length;i++){
-        let key = this.origins[i].field_key;
-        that.originForm[key]=this.origins[i].field_key;
-        that.$set(that.originForm,key,this.origins[i].field_value)
-      }*/
+      debugger;
       //图片地址
       let  imag= this.formData.filter(item => {
         return item.field_type === 'draw';
       });
-      // that.img = 'http://47.95.0.242:2222'+imag[0].draw_template;
-
-      /*let  originImag= this.origins.filter(item => {
-        return item.field_type === 'draw';
-      });*/
-      /*that.originImg = new Image();
-      that.originImg.crossOrigin = '';
-      that.originImg = imag[0].origin_value;
-*/
+      that.img = new Image();
+      that.img.crossOrigin = '';
+      that.img = 'http://47.95.0.242:2222'+imag[0].field_value;
+      that.originImg = 'http://47.95.0.242:2222'+imag[0].origin_value;
       listJudge.forEach(item => {
         let obj = new Object();
         obj = item;
diff --git a/hb_client/src/components/faceLogin/faceLogin.vue b/hb_client/src/components/faceLogin/faceLogin.vue
index afc7111..269d70f 100644
--- a/hb_client/src/components/faceLogin/faceLogin.vue
+++ b/hb_client/src/components/faceLogin/faceLogin.vue
@@ -10,12 +10,23 @@
   </div>
 </template>
 <script>
+  import tracking from '@/assets/tracking/build/tracking-min.js';
   import {faceLogin} from "@/api/testModel";
   import { getTickets } from "@/api/workflow";
-  import tracking from '@/assets/tracking/build/tracking-min.js';
   import '@/assets/tracking/build/data/face-min.js';
+  import {createrecordform,updaterecordform} from "@/api/mtm";
 
   export default {
+    props: {
+      dialogType: {
+        type:String,
+        default:"new"
+      },
+      recordform: {
+        type:Object,
+        default:null
+      }
+    },
     data() {
       return {
         video: null,
@@ -77,16 +88,26 @@
         let imgData = {base64:img};
         faceLogin(imgData).then((res) => {
           if (res.code >= 200) {
-            debugger;
-            console.log(res.data);
-            getTickets( {token:res.data.access,page:1,page_size:10,category:'duty'}).then((resp)=>{
-              if(resp.code>=200){
-                debugger;
-                console.log(resp.data);
-              }
-            })
-            that.uploadLock = false;
-            this.$message.success(res.data.username+'签到成功！');
+            const isEdit = that.dialogType === "edit";
+            if (isEdit) {
+              updaterecordform(that.recordform.id, that.recordform).then(
+                (res) => {
+                  if (res.code >= 200) {
+                    that.$emit('func',false);
+                    that.$message.success("成功");
+                  }
+                }
+              );
+            } else {
+              createrecordform(that.recordform).then((res) => {
+                if (res.code >= 200) {
+                  that.$emit('func',false);
+                  that.$message.success("成功");
+                }
+              });
+            }
+
+            // this.$message.success(res.data.username+'签到成功！');
             /*that.$confirm("是否提交?", "提示", {
               confirmButtonText: "确认",
               cancelButtonText: "取消",
diff --git a/hb_client/src/layout/components/TagsView/index.vue b/hb_client/src/layout/components/TagsView/index.vue
index fde1524..c080bc4 100644
--- a/hb_client/src/layout/components/TagsView/index.vue
+++ b/hb_client/src/layout/components/TagsView/index.vue
@@ -20,7 +20,7 @@
       <li @click="refreshSelectedTag(selectedTag)">刷新</li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">关闭</li>
       <li @click="closeOthersTags">关闭其他</li>
-      <li @click="closeAllTags(selectedTag)">关闭多有</li>
+      <li @click="closeAllTags(selectedTag)">关闭所有</li>
     </ul>
   </div>
 </template>
diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index 23d0903..9a96da2 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -4,27 +4,27 @@
       <div class="CardTitleWrap">
         <span class="verticalLine"></span><span class="dashboardCardTitle">数据统计</span>
       </div>
-      <div class="cards">
+      <div class="cards" @click="toDetail('1')">
         <div class="cardCurrentText">本月：{{contractTotalCurrent}}</div>
         <div class="cardTotalText">{{contractTotalCount}}</div>
         <div>合同总数</div>
       </div>
-      <div class="cards">
+      <div class="cards" @click="toDetail('2')">
         <div class="cardCurrentText">本月：{{orderTotalCurrent}}</div>
         <div class="cardTotalText">{{orderTotalCount}}</div>
         <div>生产订单总数</div>
       </div>
-      <div class="cards">
+      <div class="cards" @click="toDetail('3')">
         <div class="cardCurrentText">在制：{{planTotalCurrent}}</div>
         <div class="cardTotalText">{{planTotalCount}}</div>
         <div>已排产生产任务</div>
       </div>
-      <div class="cards">
+      <div class="cards" @click="toDetail('4')">
         <div class="cardCurrentText">本月：4</div>
         <div class="cardTotalText">20</div>
         <div>累计交付产品数</div>
       </div>
-      <div class="cards">
+      <div class="cards" @click="toDetail('5')">
         <div class="cardCurrentText">本月：2</div>
         <div class="cardTotalText">2</div>
         <div>累计不合格产品数</div>
@@ -177,38 +177,60 @@
               </el-pagination>
             </div>
           </div>
-          <div :style="{height:cardTabelHeight+'px'}">
-            <ul class="lists">
-              <li class="listItem">
-                <div class="itemText">
-                  <span>玻璃低于安全库存</span><span>2021-12-30</span>
-                </div>
-              </li>
-              <li class="listItem">
-                <div class="itemText">
-                  <span>某某批货临近交货日期</span><span>2021-12-20</span>
-                </div>
-              </li>
-              <li class="listItem">
-                <div class="itemText">
-                  <span>玻璃低于安全库存</span><span>2021-11-30</span>
-                </div>
-              </li>
-              <li class="listItem">
-                <div class="itemText">
-                  <span>某某批货临近交货日期</span><span>2021-11-20</span>
-                </div>
-              </li>
-            </ul>
-          </div>
-          <!--<el-badge :value="count.total_count" class="item" @click.native="gotoTicketPage">
-            <el-icon class="el-icon-s-management" style="font-size: 70px;color: #d29898"></el-icon>
-          </el-badge>
-          <div></div>
-          <div class="dashboard-text">name: {{ name }}</div>
-          <div class="dashboard-text">perms:
-            <span v-for="perm in perms" :key="perm">{{ perm }}</span>
-          </div>-->
+          <el-tabs type="card" :style="{height:cardTabelHeight+'px'}" v-model="activeName" @tab-click="activeNameClick">
+            <el-tab-pane label="库存警告" name="库存警告">
+              <ul class="lists">
+                <li class="listItem">
+                  <div class="itemText">
+                    <span>玻璃低于安全库存</span><span>2021-12-30</span>
+                  </div>
+                </li>
+                <li class="listItem" v-for="item in warningList" :key="item.id">
+                  <div class="itemText">
+                    <span>{{item}}</span><span>2021-12-20</span>
+                  </div>
+                </li>
+                <!--<li class="listItem">
+                  <div class="itemText">
+                    <span>玻璃低于安全库存</span><span>2021-11-30</span>
+                  </div>
+                </li>
+                <li class="listItem">
+                  <div class="itemText">
+                    <span>某某批货临近交货日期</span><span>2021-11-20</span>
+                  </div>
+                </li>-->
+              </ul>
+            </el-tab-pane>
+            <el-tab-pane label="临近交货" name="临近交货">
+              <ul class="lists">
+                <li class="listItem">
+                  <div class="itemText">
+                    <span>某某批货临近交货日期</span><span>2021-12-20</span>
+                  </div>
+                </li>
+                <li class="listItem" v-for="item in warningList" :key="item.id">
+                  <div class="itemText">
+                    <span>{{item}}</span><span>2021-12-20</span>
+                  </div>
+                </li>
+              </ul>
+            </el-tab-pane>
+            <el-tab-pane label="过期提醒" name="过期提醒">
+              <ul class="lists">
+                <li class="listItem">
+                  <div class="itemText">
+                    <span>某某批货临近过期</span><span>2021-11-20</span>
+                  </div>
+                </li>
+                <li class="listItem" v-for="item in warningList" :key="item.id">
+                  <div class="itemText">
+                    <span>{{item}}</span><span>2021-12-20</span>
+                  </div>
+                </li>
+              </ul>
+            </el-tab-pane>
+          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
@@ -218,8 +240,10 @@
 <script>
 import echarts from 'echarts'
 import { mapGetters } from 'vuex';
+import { getMaterialList } from "@/api/mtm";
 import { getInventoryList } from "@/api/inm";
 import { getProductionplanList} from "@/api/pm";
+import { getmaterialbatchList } from "@/api/inm";
 import { getContractList , getOrderList } from "@/api/sam";
 
 export default {
@@ -245,6 +269,7 @@ export default {
       planList:[],
       stockList:[],
       remindList:[],
+      warningList:[],
       list:[
         {id:1,name:'HIehd9',card:'3337',sco:'REF-32'},
         {id:1,name:'HIehd9',card:'3337',sco:'REF-32'},
@@ -258,6 +283,7 @@ export default {
         "5":'加工工具',
         "6":'辅助工装',
       },
+      activeName:'库存警告',
       seriesData:[80,95,96, 96, 96, 98, 99,100],
       contractTotalCount:null,//合同总数
       contractTotalCurrent:null,
@@ -281,49 +307,56 @@ export default {
   },
   methods:{
     getStatisticsData(){
+      let that = this;
       let dat = new Date();
-      this.week = dat.getDay();
-      this.currentTime = dat.getTime();
-      this.currentYear = dat.getFullYear();
+      that.week = dat.getDay();
+      that.currentTime = dat.getTime();
+      that.currentYear = dat.getFullYear();
       let month  = dat.getMonth() + 1;
-      this.currentMonth = month>9?month:'0'+month ;
-      this.currentDay =  dat.getDate();
-      let create_time_start = this.currentYear+'-'+this.currentMonth+'-01';
+      that.currentMonth = month>9?month:'0'+month ;
+      that.currentDay =  dat.getDate();
+      let create_time_start = that.currentYear+'-'+that.currentMonth+'-01';
       //获取合同数
       getContractList({page:1,page_size:1}).then((response) => {
         if (response.data) {
-          this.contractTotalCount = response.data.count;
+          that.contractTotalCount = response.data.count;
         }
       });
       getContractList({page:1,page_size:1,create_time_start:create_time_start}).then((response) => {
         if (response.data) {
-          this.contractTotalCurrent = response.data.count;
+          that.contractTotalCurrent = response.data.count;
         }
       });
       //获取生产订单数
       getOrderList({page:1,page_size:1}).then((response) => {
         if (response.data) {
-          this.orderTotalCount = response.data.count;
+          that.orderTotalCount = response.data.count;
         }
       });
       getOrderList({page:1,page_size:1,create_time_start:create_time_start}).then((response) => {
         if (response.data) {
-          this.orderTotalCurrent = response.data.count;
+          that.orderTotalCurrent = response.data.count;
         }
       });
       //获取已排产任务
       getProductionplanList({page:1,page_size:1}).then((response) => {
         if (response.data) {
-          this.planTotalCount = response.data.count;
+          that.planTotalCount = response.data.count;
         }
       });
       getProductionplanList({page:1,page_size:1,tag:'working'}).then((response) => {
         if (response.data) {
-          this.planTotalCurrent = response.data.count;
+          that.planTotalCurrent = response.data.count;
         }
       });
       //获取交付产品
       //获取不合格产品
+
+      getMaterialList({page:0,tag:'low_inm'}).then((response) => {
+        if (response.data) {
+          that.warningList = response.data;
+        }
+      });
     },
     gotoTicketPage(){
       let path = this.$route.path;
@@ -471,16 +504,30 @@ export default {
     stockMore(){
       this.$router.push({name:'warehouse',params:{}})
     },
+    toDetail(index){
+      if(index==='1'){
+        this.$router.push({name:'contract',params:{page:1,page_size:20}})
+      }else if(index==='2'){
+        this.$router.push({name:'order',params:{page:1,page_size:20}})
+      }else if(index==='3'){
+        this.$router.push({name:'plan',params:{page:1,page_size:20}})
+      }else if(index==='4'){
+        this.$router.push({name:'product',params:{page:1,page_size:20,material__type:1}})
+      }else if(index==='5'){
+        this.$router.push({name:'product',params:{page:1,page_size:20,material__type:1}})
+      }
+    },
     //便捷查询按钮
     convenientClick(index,type){
-      let startTime = '',endTime = '',url='',activeIndex = '1',obj = new Object();
+      let that = this;
+      let startTime = '',endTime = '',activeIndex = '1';
       let dat = new Date();
       let week = dat.getDay();//0-6
       let currentTime = dat.getTime();
       let currentYear = dat.getFullYear();
       let currentMonth =  dat.getMonth() + 1;
       let currentDay =  dat.getDate();
-      endTime = currentYear+'-'+currentMonth+''+currentDay;
+      endTime = currentYear+'-'+currentMonth+'-'+currentDay;
       if(type==='week'){
         activeIndex = '1';
         let num = week===0?6:week-1;
@@ -505,11 +552,16 @@ export default {
         }
         startTime = yea+'-'+mon+'-01';
       }
-      obj.startTime = startTime;
-      obj.endTime = endTime;
       if(index==='1'){
         this.tableDate = null;
         this.tableIndex = activeIndex;
+        this.listLoadingPlan = true;
+        getProductionplanList({page:0,create_time_start:startTime,create_time_end:endTime}).then((response) => {
+          if (response.data) {
+            that.planList = response.data;
+          }
+          this.listLoadingPlan = false;
+        });
       }else{
         this.chartDate = null;
         this.chartIndex = activeIndex;
@@ -518,6 +570,7 @@ export default {
     },
     //选择月份
     searchTimeChange(index){
+      let that = this;
       let startDate = '',endDate = '';
       let year = null,month = null,days = null;
       if(index==='1'){
@@ -527,16 +580,23 @@ export default {
         month = this.tableDate.split("-")[1];
         let d = new Date(year, month, 0);
         days = d.getDate();
+        endDate = this.tableDate + '-'+days;
+        this.listLoadingPlan = true;
+        getProductionplanList({page:0,create_time_start:startDate,create_time_end:endDate}).then((response) => {
+          if (response.data) {
+            that.planList = response.data;
+          }
+          this.listLoadingPlan = false;
+        });
       }else{
         this.chartIndex = null;
         startDate = this.chartDate+'-01';
-        year = this.tableDate.split("-")[0];
-        month = this.tableDate.split("-")[1];
+        year = this.chartDate.split("-")[0];
+        month = this.chartDate.split("-")[1];
         let d = new Date(year, month, 0);
         days = d.getDate();
+        endDate = this.chartDate + '-'+days;
       }
-      endDate = this.chartDate + '-'+days;
-      console.log(startDate,endDate);
     },
     handleStockSizeChange(val){
       this.stockPageSize = val;
@@ -554,6 +614,36 @@ export default {
         this.listLoading = false;
       });
     },
+    activeNameClick(tab, event) {
+      let that = this;
+      // debugger;
+      // console.log(tab, event);
+      if (tab.label === '库存警告') {
+        getMaterialList({page:0,tag:'low_inm'}).then((response) => {
+          if (response.data) {
+            that.warningList = response.data;
+            that.remindTotal = response.data.length;
+          }
+          this.listLoadingPlan = false;
+        });
+      }else if(tab.label === '临近交货') {
+        getmaterialbatchList({page:0,tag:'expired'}).then((response) => {
+          if (response.data) {
+            that.warningList = response.data;
+            that.remindTotal = response.data.length;
+          }
+          this.listLoadingPlan = false;
+        });
+      } else if(tab.label === '过期提醒'){
+        getmaterialbatchList({page:0,tag:'expired'}).then((response) => {
+          if (response.data) {
+            that.warningList = response.data;
+            that.remindTotal = response.data.length;
+          }
+          this.listLoadingPlan = false;
+        });
+      }
+    },
     handleRemindSizeChange(val){
       this.remindPageSize = val;
       this.remindPage = 1;
@@ -567,7 +657,7 @@ export default {
     // let he  = document.documentElement.clientHeight || document.body.clientHeight;
     let hei  = document.getElementsByClassName('app-main')[0].clientHeight;
     let heig  = document.getElementsByClassName('dashboardTopCard')[0].clientHeight;
-    this.cardTabelHeight = ((hei-heig)/2-80);
+    this.cardTabelHeight = ((hei-heig-130)/2);
     document.getElementById('chartColumn').style.height = this.cardTabelHeight+'px';
     this.drawChart();
     this.getPlanList();
@@ -706,7 +796,7 @@ export default {
     .listItem{
       height: 40px;
       line-height: 40px;
-      font-size: 18px;
+      font-size: 16px;
       .itemText{
         display: flex;
         justify-content: space-between;
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 0edb0a0..9f65165 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -1,86 +1,77 @@
 <template>
- 
   <div class="app-container">
     <el-card>
-     
-        <div>
-          <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
-        >新增物料</el-button
-      >
-      <el-input
-              v-model="listQuery.search"
-              placeholder="物料名称/物料编号"
-              style="width: 300px"
-              class="filter-item"
-              @keyup.enter.native="handleFilter"
-            />
-            <el-button
-              class="filter-item"
-              type="primary"
-              icon="el-icon-search"
-              @click="handleFilter"
-              >搜索</el-button
-            >
-            <el-button
-              class="filter-item"
-              type="primary"
-              icon="el-icon-refresh-left"
-              @click="resetFilter"
-              >重置</el-button
-            >
-    </div>
-   
+      <div>
+        <el-button type="primary" icon="el-icon-plus" @click="handleCreate">
+          新增物料
+        </el-button>
+        <el-input
+          v-model="listQuery.search"
+          placeholder="物料名称/物料编号"
+          style="width: 300px"
+          class="filter-item"
+          @keyup.enter.native="handleFilter"
+        />
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="handleFilter"
+        >搜索
+        </el-button>
+        <el-button
+          class="filter-item"
+          type="primary"
+          icon="el-icon-refresh-left"
+          @click="resetFilter"
+        >重置
+        </el-button>
+      </div>
     </el-card>
     <el-card style="margin-top: 2px">
-       <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-    <el-tab-pane label="成品" name="1"></el-tab-pane>
-    <el-tab-pane label="半成品" name="2"></el-tab-pane>
-    <el-tab-pane label="主要原料" name="3"></el-tab-pane>
-    <el-tab-pane label="辅助材料" name="4"></el-tab-pane>
-      <el-tab-pane label="加工工具" name="5"></el-tab-pane>
-    <el-tab-pane label="辅助工装" name="6"></el-tab-pane>
-  </el-tabs>
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="成品" name="1"></el-tab-pane>
+        <el-tab-pane label="半成品" name="2"></el-tab-pane>
+        <el-tab-pane label="主要原料" name="3"></el-tab-pane>
+        <el-tab-pane label="辅助材料" name="4"></el-tab-pane>
+        <el-tab-pane label="加工工具" name="5"></el-tab-pane>
+        <el-tab-pane label="辅助工装" name="6"></el-tab-pane>
+      </el-tabs>
       <el-table
         v-loading="listLoading"
         :data="materialList.results"
         border
         fit
         stripe
-       highlight-current-row
+        highlight-current-row
         max-height="620"
-         height="100"
+        height="100"
         v-el-height-adaptive-table="{bottomOffset: 40}"
       >
-        <el-table-column type="index" width="50" />
-         <el-table-column label="物料编号">
+        <el-table-column type="index" width="50"/>
+        <el-table-column label="物料编号">
           <template slot-scope="scope">
-           
             {{ scope.row.number }}
-            </template>
+          </template>
         </el-table-column>
-
-       <el-table-column label="物料类别"  >
-          <template slot-scope="scope">    {{options_[scope.row.type]}}</template>
+        <el-table-column label="物料类别">
+          <template slot-scope="scope"> {{options_[scope.row.type]}}</template>
         </el-table-column>
-      
         <el-table-column label="物料名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
-       
         <el-table-column label="规格型号">
           <template slot-scope="scope">{{ scope.row.specification }}</template>
         </el-table-column>
-         <el-table-column label="单片玻璃数量" v-if="materialList.results[0].type==1">
+        <el-table-column label="单片玻璃数量" v-if="materialList.results[0].type==1">
           <template slot-scope="scope">{{ scope.row.piece_count }}</template>
         </el-table-column>
-        
         <el-table-column label="计量单位">
           <template slot-scope="scope">{{ scope.row.unit }}</template>
         </el-table-column>
-       <el-table-column label="创建时间">
+        <el-table-column label="创建时间">
           <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>
-
         <el-table-column
           align="center"
           label="操作"
@@ -91,27 +82,26 @@
               v-if="checkPermission(['material_update'])"
               type="primary"
               @click="handlebind(scope)"
-              >检查表</el-link
-            >
-            
+            >检查表
+            </el-link>
             <el-link
               v-if="checkPermission(['material_update'])"
               type="primary"
               @click="handleEdit(scope)"
-              >编辑</el-link
-            >
-             <el-link
+            >编辑
+            </el-link>
+            <el-link
               v-if="checkPermission(['material_update'])"
               type="primary"
               @click="handledetail(scope)"
-              >详情</el-link
-            >
+            >详情
+            </el-link>
             <el-link
               v-if="checkPermission(['material_delete'])"
               type="danger"
               @click="handleDelete(scope)"
-              >删除</el-link
-            >
+            >删除
+            </el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -136,46 +126,46 @@
         :rules="rule1"
       >
         <el-form-item label="物料名称" prop="name">
-          <el-input v-model="material.name" placeholder="物料名称" />
+          <el-input v-model="material.name" placeholder="物料名称"/>
         </el-form-item>
         <el-form-item label="物料编号" prop="number">
-          <el-input v-model="material.number" placeholder="物料编号" />
+          <el-input v-model="material.number" placeholder="物料编号"/>
         </el-form-item>
-         <el-form-item label="规格型号" prop="specification">
-          <el-input v-model="material.specification" placeholder="规格型号" />
+        <el-form-item label="规格型号" prop="specification">
+          <el-input v-model="material.specification" placeholder="规格型号"/>
         </el-form-item>
-        
+
         <el-form-item label="计量单位" prop="unit">
-        <el-select  style="width: 100%" v-model="material.unit" placeholder="请选择">
-             <el-option
-                v-for="item in unitoptions"
-                :key="item.value"
-                :label="item.label"
-               :value="item.value">
-              </el-option>
+          <el-select style="width: 100%" v-model="material.unit" placeholder="请选择">
+            <el-option
+              v-for="item in unitoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
-      
-          <el-form-item label="物料类别" prop="type">
-         
-           <el-select  style="width: 100%" v-model="material.type" placeholder="请选择" >
-             <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-               :value="item.value">
-              </el-option>
+
+        <el-form-item label="物料类别" prop="type">
+
+          <el-select style="width: 100%" v-model="material.type" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
           </el-select>
         </el-form-item>
-           <el-form-item label="单片玻璃数量" prop="piece_count" v-if="material.type==1">
-          <el-input v-model="material.piece_count" placeholder="单片玻璃数量" />
+        <el-form-item label="单片玻璃数量" prop="piece_count" v-if="material.type==1">
+          <el-input v-model="material.piece_count" placeholder="单片玻璃数量"/>
         </el-form-item>
-     
+
 
         <el-form-item label="排序" prop="sort_str">
-          <el-input v-model="material.sort_str" placeholder="排序" />
+          <el-input v-model="material.sort_str" placeholder="排序"/>
         </el-form-item>
-        
+
       </el-form>
       <div style="text-align: right">
         <el-button type="danger" @click="dialogVisible = false">取消</el-button>
@@ -185,37 +175,44 @@
   </div>
 </template>
 <script>
-import { getMaterialList,getMaterial, createMaterial,updateMaterial,deleteMaterial,getProcessList } from "@/api/mtm";
-import checkPermission from "@/utils/permission";
+  import {
+    getMaterialList,
+    getMaterial,
+    createMaterial,
+    updateMaterial,
+    deleteMaterial,
+    getProcessList
+  } from "@/api/mtm";
+  import checkPermission from "@/utils/permission";
 
 
-import { genTree } from "@/utils";
-import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
-const defaultmaterial = {
-  name: "",
-  number: "",
-  processes:[],
-};
-export default {
-  components: { Pagination },
-  data() {
-    return {
-      material: defaultmaterial,
-      materialList: {
-        count: 0,
-      },
-      processOptions:[],
-       options_:{
-        
-        "1":'成品',
-        "2":'半成品',
-        "3":'主要原料',
-        "4":'辅助材料',
-         "5":'加工工具',
-        "6":'辅助工装',
-       
-      },
-      options: [{
+  import {genTree} from "@/utils";
+  import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+  const defaultmaterial = {
+    name: "",
+    number: "",
+    processes: [],
+  };
+  export default {
+    components: {Pagination},
+    data() {
+      return {
+        material: defaultmaterial,
+        materialList: {
+          count: 0,
+        },
+        processOptions: [],
+        options_: {
+
+          "1": '成品',
+          "2": '半成品',
+          "3": '主要原料',
+          "4": '辅助材料',
+          "5": '加工工具',
+          "6": '辅助工装',
+
+        },
+        options: [{
           value: 1,
           label: '成品'
         }, {
@@ -234,164 +231,162 @@ export default {
           value: 6,
           label: '辅助工装'
         }],
-        unitoptions:[
+        unitoptions: [
           {
-          value: '块',
-          label: '块'
-        }, {
-          value: '套',
-          label: '套'
-        },
-         {
-          value: '个',
-          label: '个'
-        }, {
-          value: 'm2',
-          label: 'm2'
-        }, {
-          value: '瓶',
-          label: '瓶'
-        },
+            value: '块',
+            label: '块'
+          }, {
+            value: '套',
+            label: '套'
+          },
+          {
+            value: '个',
+            label: '个'
+          }, {
+            value: 'm2',
+            label: 'm2'
+          }, {
+            value: '瓶',
+            label: '瓶'
+          },
         ],
-      listQuery: {
-        page: 1,
-        page_size: 20,
-      },
-      activeName:"",
+        listQuery: {
+          page: 1,
+          page_size: 20,
+        },
+        activeName: "",
 
-      listLoading: true,
-      dialogVisible: false,
-      dialogType: "new",
-      rule1: {
-        name: [{ required: true, message: "请输入", trigger: "blur" }],
-        number: [{ required: true, message: "请输入", trigger: "blur" }],
-       
-      },
-    };
-  },
-  computed: {},
-  watch: {},
-  created() {
-    this.getList();
-    this.getProcessList();
-   
-  },
-  methods: {
-    checkPermission,
+        listLoading: true,
+        dialogVisible: false,
+        dialogType: "new",
+        rule1: {
+          name: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入", trigger: "blur"}],
 
-    //物料详情
-    handledetail(scope)
-    {
-        this.$router.push({name: "MaterialDetail", params: { id: scope.row.id }, })
-           
+        },
+      };
     },
-  
-
-     //选项卡切换
-    handleClick(tab) {
-      this.listLoading = true;
-      this.listQuery.type=tab.name;
-      getMaterialList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.materialList = response.data;
-        }
-        this.listLoading = false;
-      });
-    },
-     getList() {
-      this.listLoading = true;
-      getMaterialList(this.listQuery).then((response) => {
-        if (response.data) {
-          this.materialList = response.data;
-        }
-        this.listLoading = false;
-      });
-    },
-    //工序清单
- getProcessList() {
-      getProcessList().then((res) => {
-        this.processOptions = res.data.results;
-      });
-    },
-    //绑定工序
-    handlebind(scope)
-    {
-    
-      this.$router.push({name: "MaterialDO", params: { id: scope.row.id }, })
-    }
-,
-    handleFilter() {
-      this.listQuery.page = 1;
+    computed: {},
+    watch: {},
+    created() {
       this.getList();
+      this.getProcessList();
+
     },
-    resetFilter() {
-      this.activeName="";
-      this.listQuery = {
-        page: 1,
-        page_size: 20,
-      }
-      this.getList();
-    },
-    handleCreate() {
-      this.material = Object.assign({}, defaultmaterial);
-      this.dialogType = "new";
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-   
-    handleEdit(scope) {
-      this.material = Object.assign({}, scope.row); // copy obj
-      this.dialogType = "edit";
-      this.dialogVisible = true;
-      this.$nextTick(() => {
-        this.$refs["Form"].clearValidate();
-      });
-    },
-    handleDelete(scope) {
-      this.$confirm("确认删除?", "警告", {
-        confirmButtonText: "确认",
-        cancelButtonText: "取消",
-        type: "error",
-      })
-        .then(async () => {
-          await deleteMaterial(scope.row.id);
-          this.getList();
-          this.$message.success("成功");
-        })
-        .catch((err) => {
-          console.error(err);
-        });
-    },
-   
-    async confirm(form) {
-      this.$refs[form].validate((valid) => {
-        if (valid) {
-          const isEdit = this.dialogType === "edit";
-          if (isEdit) {
-            updateMaterial(this.material.id, this.material).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
-          } else {
-            createMaterial(this.material).then((res) => {
-              if (res.code >= 200) {
-                this.getList();
-                 this.dialogVisible = false;
-                this.$message.success("成功");
-              }
-            });
+    methods: {
+      checkPermission,
+
+      //物料详情
+      handledetail(scope) {
+        this.$router.push({name: "MaterialDetail", params: {id: scope.row.id},})
+
+      },
+
+
+      //选项卡切换
+      handleClick(tab) {
+        this.listLoading = true;
+        this.listQuery.type = tab.name;
+        getMaterialList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.materialList = response.data;
           }
-        } else {
-          return false;
+          this.listLoading = false;
+        });
+      },
+      getList() {
+        this.listLoading = true;
+        getMaterialList(this.listQuery).then((response) => {
+          if (response.data) {
+            this.materialList = response.data;
+          }
+          this.listLoading = false;
+        });
+      },
+      //工序清单
+      getProcessList() {
+        getProcessList().then((res) => {
+          this.processOptions = res.data.results;
+        });
+      },
+      //绑定工序
+      handlebind(scope) {
+
+        this.$router.push({name: "MaterialDO", params: {id: scope.row.id},})
+      }
+      ,
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      resetFilter() {
+        this.activeName = "";
+        this.listQuery = {
+          page: 1,
+          page_size: 20,
         }
-      });
+        this.getList();
+      },
+      handleCreate() {
+        this.material = Object.assign({}, defaultmaterial);
+        this.dialogType = "new";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+
+      handleEdit(scope) {
+        this.material = Object.assign({}, scope.row); // copy obj
+        this.dialogType = "edit";
+        this.dialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs["Form"].clearValidate();
+        });
+      },
+      handleDelete(scope) {
+        this.$confirm("确认删除?", "警告", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "error",
+        })
+          .then(async () => {
+            await deleteMaterial(scope.row.id);
+            this.getList();
+            this.$message.success("成功");
+          })
+          .catch((err) => {
+            console.error(err);
+          });
+      },
+
+      async confirm(form) {
+        this.$refs[form].validate((valid) => {
+          if (valid) {
+            const isEdit = this.dialogType === "edit";
+            if (isEdit) {
+              updateMaterial(this.material.id, this.material).then((res) => {
+                if (res.code >= 200) {
+                  this.getList();
+                  this.dialogVisible = false;
+                  this.$message.success("成功");
+                }
+              });
+            } else {
+              createMaterial(this.material).then((res) => {
+                if (res.code >= 200) {
+                  this.getList();
+                  this.dialogVisible = false;
+                  this.$message.success("成功");
+                }
+              });
+            }
+          } else {
+            return false;
+          }
+        });
+      },
     },
-  },
-};
+  };
 </script>
 
diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue
index f6d227f..fed046b 100644
--- a/hb_client/src/views/mtm/materialdo.vue
+++ b/hb_client/src/views/mtm/materialdo.vue
@@ -20,49 +20,43 @@
             </el-button>
             <!--表格列表-->
             <el-table
-            
               :data="recordformList.results"
               border
               fit
               stripe
               highlight-current-row
               height="670"
-               v-el-height-adaptive-table="{ bottomOffset: 20 }"
+              v-el-height-adaptive-table="{ bottomOffset: 20 }"
               @current-change="handleCurrentChange"
             >
               <el-table-column type="index" width="50"/>
               <el-table-column label="表名称">
                 <template slot-scope="scope">{{ scope.row.name }}</template>
               </el-table-column>
-               <el-table-column label="是否启用">
+              <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-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
                     v-if="checkPermission(['material_update'])"
                     @click="handleLook(scope)"
                   >查看
-                  </el-link
-                  >
+                  </el-link>
                   <el-link
                     v-if="checkPermission(['material_update'])"
                     @click="handleEdit(scope)"
                   >编辑
-                  </el-link
-                  >
+                  </el-link>
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handleDelete(scope)"
                   >删除
-                  </el-link
-                  >
+                  </el-link>
                 </template>
               </el-table-column>
             </el-table>
@@ -81,17 +75,15 @@
                 <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-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"
-                >取消
-                </el-button>
-                <el-button type="primary" @click="recordformconfirm('Forms')"
-                >确认
+                <el-button type="danger" @click="dialogVisible = false">取消
                 </el-button>
+                <!--<el-button type="primary" @click="recordformconfirm('Forms')">确认</el-button>-->
+                <el-button type="primary" @click="recordformcon">管理员授权</el-button>
               </div>
             </el-dialog>
             <!--表格展示-->
@@ -238,9 +230,9 @@
                 </el-row>
               </el-form>-->
               <!--<div style="text-align: right">-->
-                <!--<el-button type="primary" @click="judgeForm">-->
-                  <!--合格验证-->
-                <!--</el-button>-->
+              <!--<el-button type="primary" @click="judgeForm">-->
+              <!--合格验证-->
+              <!--</el-button>-->
               <!--</div>-->
             </el-dialog>
           </el-card>
@@ -256,8 +248,7 @@
               icon="el-icon-plus"
               @click="handlefieldCreate"
             >新增
-            </el-button
-            >
+            </el-button>
             <!--表格字段列表-->
             <el-table
               :data="fieldList.results"
@@ -270,23 +261,18 @@
             >
               <el-table-column type="index" width="50"/>
               <el-table-column label="字段名称">
-                <template slot-scope="scope">{{
-                  scope.row.field_name
-                  }}
+                <template slot-scope="scope">
+                  {{scope.row.field_name}}
                 </template>
               </el-table-column>
-
               <el-table-column label="字段类型">
-                <template slot-scope="scope">{{
-                  options_[scope.row.field_type]
-                  }}
+                <template slot-scope="scope">
+                  {{options_[scope.row.field_type]}}
                 </template>
               </el-table-column>
-
               <el-table-column label="字段标识">
-                <template slot-scope="scope">{{
-                  scope.row.field_key
-                  }}
+                <template slot-scope="scope">
+                  {{scope.row.field_key}}
                 </template>
               </el-table-column>
               <!--
@@ -317,7 +303,6 @@
                   <el-tag v-else>否</el-tag>
                 </template>
               </el-table-column>
-
               <el-table-column align="center" label="操作">
                 <template slot-scope="scope">
                   <el-link
@@ -325,15 +310,13 @@
                     type="primary"
                     @click="handlefieldEdit(scope)"
                   >编辑
-                  </el-link
-                  >
+                  </el-link>
                   <el-link
                     v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handlefieldDelete(scope)"
                   >删除
-                  </el-link
-                  >
+                  </el-link>
                 </template>
               </el-table-column>
             </el-table>
@@ -383,8 +366,7 @@
                     field.field_type == 'radio' ||
                     field.field_type == 'checkbox' ||
                     field.field_type == 'select' ||
-                    field.field_type == 'selects'
-                  "
+                    field.field_type == 'selects'"
                 >
                   <el-button @click.prevent="addDomain" style="border: none">
                     <i class="el-icon-circle-plus-outline"></i>
@@ -527,6 +509,17 @@
         </el-col>
       </el-row>
     </el-card>
+    <el-dialog :visible.sync="limitedPhoto">
+      <div style="font-size: 28px;color: #333333;text-align: center;font-weight: bold;margin-bottom: 15px;">权限验证</div>
+      <div class="testTracking">
+        <faceLogin
+          name="faceLogin"
+          :dialogType="dialogType"
+          :recordform="recordform"
+          @func="getMsgFormSon"
+        ></faceLogin>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -536,6 +529,7 @@
   import {getEquipmentAll} from "@/api/equipment";
   import vueJsonEditor from "vue-json-editor";
   import {upUrl, upHeaders} from "@/api/file";
+  import faceLogin from '@/components/faceLogin/faceLogin.vue'
   import {
     getrecordformList,
     createrecordform,
@@ -557,11 +551,11 @@
     number: "",
   };
 
-  const defaultrecordform = {enabled:false};
+  const defaultrecordform = {enabled: false};
   const defaultfield = {};
   let preDrawAry = [];
   export default {
-    components: {Pagination, vueJsonEditor, Treeselect, customForm},
+    components: {Pagination, vueJsonEditor, Treeselect, customForm,faceLogin},
     data() {
       return {
         step: defaultstep,
@@ -576,13 +570,15 @@
         dialogVisibleForm: false,
         dialogTypes: "new",
         field: {
-          field_type: "",
+          field_type: null,
           field_key: "",
-          field_name: "",
-          sort: "",
-          parent: "",
-          help_text: "",
-          draw_template: "",//图片模板
+          field_name: null,
+          sort: null,
+          parent: null,
+          help_text: null,
+          rule_expression: null,
+          display_expression: null,
+          draw_template: null,//图片模板
           field_choice: [""],
         },
         field_choice: [""],
@@ -699,6 +695,7 @@
         imgData: '',
         canvasImg: '',
         judgeList: [],
+        limitedPhoto:false
       };
     },
     computed: {},
@@ -836,9 +833,9 @@
               that.$set(that.checkForm, key, '')
             }
             that.dialogVisibleForm = true;
-           /* setTimeout(function () {
-              that.canvasInit();
-            }, 500);*/
+            /* setTimeout(function () {
+               that.canvasInit();
+             }, 500);*/
           }
         });
         that.fieldLists();
@@ -888,9 +885,10 @@
         this.recordform = Object.assign({}, defaultrecordform);
         this.dialogType = "new";
         this.dialogVisible = true;
-        this.$nextTick(() => {
-          this.$refs["Forms"].clearValidate();
-        });
+        this.$refs["Forms"].resetFields();
+        // this.$nextTick(() => {
+        //   this.$refs["Forms"].resetFields();
+        // });
       },
       //新增字段
       handlefieldCreate() {
@@ -898,7 +896,18 @@
         // this.field = Object.assign({}, defaultfield);
         this.dialogType1 = "new";
         this.dialogVisible1 = true;
+        // this.$refs["Form"].resetFields();
         this.$nextTick(() => {
+          this.field.field_type= null;
+          this.field.field_key= null;
+          this.field.field_name= null;
+          this.field.sort= null;
+          this.field.parent= null;
+          this.field.help_text= null;
+          this.field.draw_template= null;
+          this.field.field_choice= null;
+          this.field.rule_expression= null;
+          this.field.display_expression= null;
           this.$refs["Form"].clearValidate();
         });
       },
@@ -1016,6 +1025,16 @@
           }
         });
       },
+      recordformcon(){
+        this.recordform.material = this.material;
+        this.recordform.type = 2;
+        this.limitedPhoto = true;
+      },
+      getMsgFormSon(data){
+        this.limitedPhoto = data;
+        this.recordformLists();
+        this.dialogVisible = false;
+      },
     },
   };
 </script>
diff --git a/hb_client/src/views/pm/plan.vue b/hb_client/src/views/pm/plan.vue
index faed2a3..19710e1 100644
--- a/hb_client/src/views/pm/plan.vue
+++ b/hb_client/src/views/pm/plan.vue
@@ -3,29 +3,28 @@
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>生产任务列表</span>
-
       </div>
-   <el-input
-              v-model="listQuery1.search"
-              placeholder="任务编号/订单编号/合同编号/产品名称"
-              style="width: 300px"
-              class="filter-item"
-              @keyup.enter.native="handleFilter"
-            />
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="handleFilter"
-          >搜索</el-button
-        >
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-refresh-left"
-          @click="resetFilter"
-          >重置</el-button
-        >
+      <el-input
+        v-model="listQuery1.search"
+        placeholder="任务编号/订单编号/合同编号/产品名称"
+        style="width: 300px"
+        class="filter-item"
+        @keyup.enter.native="handleFilter"
+      />
+      <el-button
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="handleFilter"
+      >搜索
+      </el-button>
+      <el-button
+        class="filter-item"
+        type="primary"
+        icon="el-icon-refresh-left"
+        @click="resetFilter"
+      >重置
+      </el-button>
       <el-table
         :data="productionplanList.results"
         border
@@ -33,11 +32,8 @@
         stripe
         style="width: 100%"
         height="300"
-
       >
         <el-table-column type="index" width="50"/>
-
-
         <el-table-column label="任务编号" width="110">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
@@ -47,7 +43,6 @@
         <el-table-column label="合同编号" width="110">
           <template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.order_.contract_.number }}</template>
         </el-table-column>
-
         <el-table-column label="产品名称" width="150" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>
         </el-table-column>
@@ -60,7 +55,7 @@
         <el-table-column label="生产数量" width="110">
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
-          <el-table-column label="状态" width="110">
+        <el-table-column label="状态" width="110">
           <template slot-scope="scope">{{ state_[scope.row.state] }}</template>
         </el-table-column>
         <el-table-column label="计划开工时间" width="110">
@@ -135,7 +130,7 @@
             <template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.number }}</template>
           </el-table-column>
           <el-table-column label="合同名称" show-overflow-tooltip width="110">
-            <template slot-scope="scope"  v-if="scope.row.contract">{{ scope.row.contract_.name }}</template>
+            <template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.name }}</template>
           </el-table-column>
           <el-table-column label="所需产品" show-overflow-tooltip width="150">
             <template slot-scope="scope">{{ scope.row.product_.name }}</template>
@@ -161,7 +156,7 @@
           <el-table-column
             align="center"
             label="操作"
-             fixed="right"
+            fixed="right"
             width="220px"
           >
             <template slot-scope="scope">
@@ -231,7 +226,7 @@
   </div>
 </template>
 <script>
-  import gantt  from "@/components/Gantt/index";
+  import gantt from "@/components/Gantt/index";
   import {getordertoplan} from "@/api/sam";
   import {createProductionplan, getProductionplanList, createsubplan} from "@/api/pm";
   import {getMaterialList} from "@/api/mtm";
@@ -242,20 +237,21 @@
   import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
   const defaulteorderplan = {};
   export default {
-    components: {Pagination,gantt},
+    components: {Pagination, gantt},
     data() {
       return {
         orderplan: defaulteorderplan,
         orderList: {
           count: 0,
         },
-         state_:{
-        10:'制定中',
-        20:'已下达',
-        30:'已接受',
-        40:'生产中',
-        50:'已完成',
-         60:'军检完成'},
+        state_: {
+          10: '制定中',
+          20: '已下达',
+          30: '已接受',
+          40: '生产中',
+          50: '已完成',
+          60: '军检完成'
+        },
         listQuery: {
           page: 1,
           page_size: 20,
@@ -277,7 +273,7 @@
           number: [{required: true, message: "请输入", trigger: "blur"}],
 
         },
-        proList:[],
+        proList: [],
       };
     },
     computed: {},
@@ -309,7 +305,7 @@
           if (response.data) {
             this.productionplanList = response.data;
             let list = response.data.results;
-            let arr= [];
+            let arr = [];
             list.forEach(item => {
               if (!item.children || item.children.length < 1) {
                 let startTime = new Date(item.start_date).getTime();
@@ -334,18 +330,18 @@
           this.listLoading = false;
         });
       },
-       //搜索生产计划
-  handleFilter() {
-      this.listQuery1.page = 1;
-      this.getplanList();
-    },
-    resetFilter() {
-      this.listQuery1 = {
-        page: 1,
-        page_size: 20,
-      }
-      this.getplanList();
-    },
+      //搜索生产计划
+      handleFilter() {
+        this.listQuery1.page = 1;
+        this.getplanList();
+      },
+      resetFilter() {
+        this.listQuery1 = {
+          page: 1,
+          page_size: 20,
+        }
+        this.getplanList();
+      },
       handleclick(scope) {
         this.orderID = scope.row.id;
         this.countsx = scope.row.count;
@@ -402,12 +398,12 @@
           });
 
       },
-      activeNameClick(tab, event){
+      activeNameClick(tab, event) {
         debugger;
         console.log(tab, event);
-        if(tab.label==='甘特图'){
+        if (tab.label === '甘特图') {
           this.ganttShow = true;
-        }else{
+        } else {
           this.ganttShow = false;
         }
       },

From c3b3f52196335092c21dff230a555a2fe48dd381 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 13 Jan 2022 16:50:33 +0800
Subject: [PATCH 05/15] clear

---
 hb_client/src/views/dashboard/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hb_client/src/views/dashboard/index.vue b/hb_client/src/views/dashboard/index.vue
index 7ad7d6b..7ff725e 100644
--- a/hb_client/src/views/dashboard/index.vue
+++ b/hb_client/src/views/dashboard/index.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="dashboard-container">
     <el-card class="dashboardTopCard">
-      <div @click="openWord">wendanag</div>
-      <a href="http://www.xdocin.com/xdoc?_func=to&_format=html&_cache=1&_xdoc=http://47.95.0.242:2222/media/2021/09/07/004-%E8%AF%B7%E5%81%87%E5%8D%95_LL8uZdx.docx" target="_blank">XDOC</a>
-      <div class="CardTitleWrap">
+     <div class="CardTitleWrap">
         <span class="verticalLine"></span><span class="dashboardCardTitle">数据统计</span>
       </div>
       <div class="cards" @click="toDetail('1')">

From 39986927d40a854182702ff35f0af76b6a11145d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Jan 2022 16:57:18 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=8F=AF=E4=B8=8D=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py
index bf90ce3..95a9e2d 100644
--- a/hb_server/apps/wpm/serializers.py
+++ b/hb_server/apps/wpm/serializers.py
@@ -423,7 +423,7 @@ class WproductPutInSerializer(serializers.Serializer):
 class WproductPutInsSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
     wproducts = serializers.PrimaryKeyRelatedField(queryset=WProduct.objects.all(), label='半成品ID', many=True)
-    remark = serializers.CharField(label="入库备注", required =False)
+    remark = serializers.CharField(label="入库备注", required =False, allow_null=True)
 
 
 class OperationEquipListSerializer(serializers.Serializer):

From 3d0a0a5c2f5c5bf4d3be3f7965d8058c8e90700a Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 13 Jan 2022 17:03:02 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=B9=E5=B1=82?=
 =?UTF-8?q?=E6=A3=80=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wpm/services.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hb_server/apps/wpm/services.py b/hb_server/apps/wpm/services.py
index 641be72..3734106 100644
--- a/hb_server/apps/wpm/services.py
+++ b/hb_server/apps/wpm/services.py
@@ -53,6 +53,9 @@ class WpmServies(object):
 
             elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and wproduct.material.type == Material.MA_TYPE_GOOD: # 成品检验
                 wproduct.act_state = WProduct.WPR_ACT_STATE_TOFINALTEST 
+            
+            elif wproduct.act_state == WProduct.WPR_ACT_STATE_TOTEST and wproduct.step.type == Step.STEP_TYPE_COMB: # 夹层检验
+                wproduct.act_state = WProduct.WPR_ACT_STATE_TOCOMBTEST
             else:
                 wproduct.act_state = WProduct.WPR_ACT_STATE_OK
             if wproduct.number is None: # 产生半成品编号

From c1ddf3ce3044b46e22c3529f68053588a79cdfe4 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 14 Jan 2022 08:36:40 +0800
Subject: [PATCH 08/15] required

---
 hb_client/src/components/customForm/index.vue  | 8 ++++++++
 hb_client/src/components/customForm/review.vue | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue
index 8aa5314..96558e8 100644
--- a/hb_client/src/components/customForm/index.vue
+++ b/hb_client/src/components/customForm/index.vue
@@ -18,6 +18,7 @@
           <el-form-item
             v-if="item.field_type === 'string'"
             :label="item.field_name"
+            :required="require"
           >
             <el-input
               v-model="checkForm[item.field_key]"
@@ -28,6 +29,7 @@
           <el-form-item
             v-else-if="item.field_type === 'int'"
             :label="item.field_name"
+            :required="require"
           >
             <el-input-number
               style="width: 100%;"
@@ -41,6 +43,7 @@
           <el-form-item
             v-else-if="item.field_type === 'float'"
             :label="item.field_name"
+            :required="require"
           >
             <el-input-number
               style="width: 100%;"
@@ -54,6 +57,7 @@
           <el-form-item
             v-else-if="item.field_type === 'date'"
             :label="item.field_name"
+            :required="require"
           >
             <el-date-picker
               v-model="checkForm[item.field_key]"
@@ -67,6 +71,7 @@
           <el-form-item
             v-else-if="item.field_type === 'datetime'"
             :label="item.field_name"
+            :required="require"
           >
             <el-date-picker
               v-model="checkForm[item.field_key]"
@@ -80,6 +85,7 @@
           <el-form-item
             v-else-if="item.field_type === 'select'"
             :label="item.field_name"
+            :required="require"
           >
             <el-select
               v-model="checkForm[item.field_key]"
@@ -98,6 +104,7 @@
           <el-form-item
             v-else-if="item.field_type === 'selects'"
             :label="item.field_name"
+            :required="require"
           >
             <el-select
               v-model="checkForm[item.field_key]"
@@ -269,6 +276,7 @@
         is_testok:true,
         testokTrue:true,
         is_save:false,
+        require:false,
         testokFalse:false,
       }
     },
diff --git a/hb_client/src/components/customForm/review.vue b/hb_client/src/components/customForm/review.vue
index 342cb79..6beb304 100644
--- a/hb_client/src/components/customForm/review.vue
+++ b/hb_client/src/components/customForm/review.vue
@@ -18,6 +18,7 @@
           <el-form-item
             v-if="item.field_type === 'string'"
             :label="item.field_name"
+            :required="require"
           >
             <el-input
               disabled
@@ -36,6 +37,7 @@
           <el-form-item
             v-else-if="item.field_type === 'int'"
             :label="item.field_name"
+            :required="require"
           >
             <el-input
               disabled
@@ -57,6 +59,7 @@
           <el-form-item
             v-else-if="item.field_type === 'float'"
             :label="item.field_name"
+            :required="require"
           >
             <el-input
               disabled
@@ -85,6 +88,7 @@
           <el-form-item
             v-else-if="item.field_type === 'date'"
             :label="item.field_name"
+            :required="require"
           >
             <el-date-picker
               disabled
@@ -107,6 +111,7 @@
           <el-form-item
             v-else-if="item.field_type === 'datetime'"
             :label="item.field_name"
+            :required="require"
           >
             <el-date-picker
               disabled
@@ -129,6 +134,7 @@
           <el-form-item
             v-else-if="item.field_type === 'select'"
             :label="item.field_name"
+            :required="require"
           >
             <el-select
               disabled
@@ -161,6 +167,7 @@
           <el-form-item
             v-else-if="item.field_type === 'selects'"
             :label="item.field_name"
+            :required="require"
           >
             <el-select
               disabled

From ef007e728afcd9468344791eb0c14fc81d0ed7c6 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 15:12:48 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=85=A5=E5=BA=93remar?=
 =?UTF-8?q?k=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/.gitignore              |   1 +
 hb_server/apps/inm/models.py      |  61 ++--
 hb_server/apps/inm/views.py       |  49 +--
 hb_server/apps/wpm/filters.py     |  28 +-
 hb_server/apps/wpm/models.py      | 235 +++++++++-----
 hb_server/apps/wpm/serializers.py |   4 +-
 hb_server/apps/wpm/views.py       | 520 +++++++++++++++---------------
 7 files changed, 507 insertions(+), 391 deletions(-)

diff --git a/hb_server/.gitignore b/hb_server/.gitignore
index 55fdc78..5e37fef 100644
--- a/hb_server/.gitignore
+++ b/hb_server/.gitignore
@@ -1,5 +1,6 @@
 .vscode/
 .vs/
+.idea/
 venv/
 __pycache__/
 *.pyc
diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index 363c0db..0fe74a4 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -17,6 +17,7 @@ class WareHouse(CommonAModel):
     number = models.CharField('仓库编号', max_length=20, unique=True)
     name = models.CharField('仓库名称', max_length=20, unique=True)
     place = models.CharField('具体地点', max_length=50)
+
     class Meta:
         verbose_name = '仓库信息'
         verbose_name_plural = verbose_name
@@ -24,37 +25,44 @@ class WareHouse(CommonAModel):
     def __str__(self):
         return self.name
 
+
 class Inventory(BaseModel):
     """
     库存物料
     """
-    material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息')
+    material = models.ForeignKey(
+        Material, on_delete=models.CASCADE, verbose_name='物料信息')
     count = models.PositiveIntegerField('仓库物料存量', default=0)
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+
     class Meta:
         verbose_name = '库存表'
         verbose_name_plural = verbose_name
 
+
 class MaterialBatch(BaseModel):
     """
     物料批次
     """
-    material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息')
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+    material = models.ForeignKey(
+        Material, on_delete=models.CASCADE, verbose_name='物料信息')
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
     count = models.PositiveIntegerField('存量', default=0)
     batch = models.CharField('批次号', max_length=100, default='')
     expiration_date = models.DateField('有效期', null=True, blank=True)
+
     class Meta:
         verbose_name = '库存表'
         verbose_name_plural = verbose_name
 
 
-
 class FIFO(CommonADModel):
     """
     出入库记录
     """
-    FIFO_TYPE_DO_OUT = 1 # 生产领料
+    FIFO_TYPE_DO_OUT = 1  # 生产领料
     FIFO_TYPE_SALE_OUT = 2
     FIFO_TYPE_PUR_IN = 3
     FIFO_TYPE_DO_IN = 4
@@ -66,7 +74,8 @@ class FIFO(CommonADModel):
     )
     type = models.IntegerField('出入库类型', default=1)
     is_audited = models.BooleanField('是否审核', default=False)
-    auditor = models.ForeignKey(User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True)
+    auditor = models.ForeignKey(
+        User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True)
     inout_date = models.DateField('出入库日期')
     remark = models.CharField('备注', max_length=1000, default='')
 
@@ -75,38 +84,46 @@ class FIFOItem(BaseModel):
     """
     出入库详细条目
     """
+    need_test = models.BooleanField('是否需要检验', default=False)
     is_tested = models.BooleanField('是否已检验', default=False)
     is_testok = models.BooleanField('是否检验合格', default=False)
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='仓库')
-    material = models.ForeignKey(Material, verbose_name='物料类型', on_delete=models.CASCADE)
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='仓库')
+    material = models.ForeignKey(
+        Material, verbose_name='物料类型', on_delete=models.CASCADE)
     count = models.PositiveIntegerField('数量', default=0)
     batch = models.CharField('批次号', max_length=100, default='')
-    fifo = models.ForeignKey(FIFO, verbose_name='关联出入库', on_delete=models.CASCADE)
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE, null=True, blank=True)
+    fifo = models.ForeignKey(FIFO, verbose_name='关联出入库',
+                             on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE, null=True, blank=True)
+
 
 class IProduct(BaseModel):
     """
     具体产品条目
     """
     number = models.CharField('物品编号', unique=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='物料类型', on_delete=models.CASCADE)
-    warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
+    material = models.ForeignKey(
+        Material, verbose_name='物料类型', on_delete=models.CASCADE)
+    warehouse = models.ForeignKey(
+        WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库')
     batch = models.CharField('所属批次号', max_length=100, default='')
     wproduct = models.ForeignKey('wpm.wproduct', on_delete=models.CASCADE, verbose_name='关联的动态产品', db_constraint=False,
-     null=True, blank=True, related_name='iproduct_wproduct')
+                                 null=True, blank=True, related_name='iproduct_wproduct')
     is_saled = models.BooleanField('是否售出', default=False)
 
+
 class FIFOItemProduct(BaseModel):
     """
     出入库产品
     """
-    fifoitem = models.ForeignKey(FIFOItem, verbose_name='关联出入库具体产品', on_delete=models.CASCADE)
+    fifoitem = models.ForeignKey(
+        FIFOItem, verbose_name='关联出入库具体产品', on_delete=models.CASCADE)
     wproduct = models.ForeignKey('wpm.wproduct', on_delete=models.CASCADE, verbose_name='关联的动态产品', db_constraint=False, null=True, blank=True,
-        related_name='fifoitem_wproduct')
+                                 related_name='fifoitem_wproduct')
     number = models.CharField('物品编号', max_length=50)
-    material = models.ForeignKey(Material, verbose_name='物料类型', on_delete=models.CASCADE)
-    iproduct = models.ForeignKey(IProduct, verbose_name='关联库存产品', null=True, blank=True, on_delete=models.SET_NULL)
-
-
-
-    
+    material = models.ForeignKey(
+        Material, verbose_name='物料类型', on_delete=models.CASCADE)
+    iproduct = models.ForeignKey(
+        IProduct, verbose_name='关联库存产品', null=True, blank=True, on_delete=models.SET_NULL)
diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py
index e91d156..2b3af52 100644
--- a/hb_server/apps/inm/views.py
+++ b/hb_server/apps/inm/views.py
@@ -6,8 +6,8 @@ from rest_framework.mixins import DestroyModelMixin, ListModelMixin, RetrieveMod
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from apps.inm.filters import IProductFilterSet, MbFilterSet
 
-from apps.inm.models import FIFO, FIFOItem, IProduct, MaterialBatch, WareHouse,Inventory
-from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, WareHouseCreateUpdateSerializer,InventorySerializer
+from apps.inm.models import FIFO, FIFOItem, IProduct, MaterialBatch, WareHouse, Inventory
+from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, WareHouseCreateUpdateSerializer, InventorySerializer
 from apps.inm.signals import update_inm
 from apps.mtm.models import Material
 from apps.pm.services import PmService
@@ -16,10 +16,13 @@ from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from django.db import transaction
+from django.utils import timezone
 
 from apps.wpm.services import WpmServies
 
 # Create your views here.
+
+
 class WarehouseViewSet(CreateUpdateModelAMixin, ModelViewSet):
     """
     仓库-增删改查
@@ -32,26 +35,30 @@ class WarehouseViewSet(CreateUpdateModelAMixin, ModelViewSet):
     ordering_fields = ['create_time']
     ordering = ['-create_time']
 
-    def  get_serializer_class(self):
+    def get_serializer_class(self):
         if self.action in ['create', 'update']:
             return WareHouseCreateUpdateSerializer
         return WareHouseSerializer
 
+
 class InventoryViewSet(ListModelMixin, GenericViewSet):
     """
     仓库物料表
     """
     perms_map = {'*': '*'}
-    queryset = Inventory.objects.select_related('material', 'warehouse').filter(count__gt=0).all()
+    queryset = Inventory.objects.select_related(
+        'material', 'warehouse').filter(count__gt=0).all()
     serializer_class = InventorySerializer
     filterset_fields = ['material', 'warehouse']
     search_fields = []
     ordering_fields = ['create_time']
     ordering = ['-create_time']
 
+
 class MaterialBatchViewSet(ListModelMixin, GenericViewSet):
     perms_map = {'*': '*'}
-    queryset = MaterialBatch.objects.select_related('material', 'warehouse').filter(count__gt=0).all()
+    queryset = MaterialBatch.objects.select_related(
+        'material', 'warehouse').filter(count__gt=0).all()
     serializer_class = MaterialBatchSerializer
     # filterset_fields = ['material', 'warehouse']
     filterset_class = MbFilterSet
@@ -59,7 +66,7 @@ class MaterialBatchViewSet(ListModelMixin, GenericViewSet):
     ordering_fields = ['create_time']
     ordering = ['-create_time']
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=MaterialBatchQuerySerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=MaterialBatchQuerySerializer)
     def query(self, request, pk=None):
         """
         复杂查询
@@ -67,9 +74,11 @@ class MaterialBatchViewSet(ListModelMixin, GenericViewSet):
         data = request.data
         serializer = MaterialBatchQuerySerializer(data=data)
         serializer.is_valid(raise_exception=True)
-        queryset = self.queryset.filter(warehouse__id=data['warehouse'], material__id__in=data['materials'])
+        queryset = self.queryset.filter(
+            warehouse__id=data['warehouse'], material__id__in=data['materials'])
         return Response(MaterialBatchSerializer(instance=queryset, many=True).data)
 
+
 class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     """
     出入库记录详情表
@@ -77,7 +86,8 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     perms_map = {'*': '*'}
     queryset = FIFOItem.objects.select_related('material', 'fifo').all()
     serializer_class = FIFOItemSerializer
-    filterset_fields = ['material', 'fifo', 'fifo__type', 'is_tested', 'is_testok']
+    filterset_fields = ['material', 'fifo',
+                        'fifo__type', 'is_tested', 'is_testok']
     search_fields = []
     ordering_fields = ['create_time']
     ordering = ['-create_time']
@@ -87,7 +97,7 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
             raise APIException('该出入库记录已通过审核, 无法删除')
         return super().perform_destroy(instance)
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=InmTestRecordCreateSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=InmTestRecordCreateSerializer)
     def test(self, request, pk=None):
         """
         检验
@@ -99,9 +109,9 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         if 'is_testok' not in vdata:
             raise APIException('未填写检验结论')
         with transaction.atomic():
-            obj = serializer.save(create_by = self.request.user)
+            obj = serializer.save(create_by=self.request.user)
             tris = []
-            for m in record_data: # 保存记录详情
+            for m in record_data:  # 保存记录详情
                 m['field_value'] = m['field_value']
                 m['is_testok'] = m['is_testok'] if 'is_testok' in m else True
                 m['test_record'] = obj
@@ -115,6 +125,7 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
                 obj.fifo_item.save()
         return Response()
 
+
 class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     """
     出入库记录
@@ -131,14 +142,14 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         if self.action == 'list':
             return FIFOListSerializer
         return super().get_serializer_class()
-    
+
     def destroy(self, request, *args, **kwargs):
         obj = self.get_object()
         if obj.is_submited:
             raise exceptions.APIException('该记录已审核,不可删除')
         return super().destroy(request, *args, **kwargs)
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=FIFOInPurSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=FIFOInPurSerializer)
     def in_pur(self, request, pk=None):
         """
         采购入库
@@ -148,7 +159,7 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         serializer.save(create_by=request.user)
         return Response()
 
-    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=serializers.Serializer)
+    @action(methods=['post'], detail=True, perms_map={'post': '*'}, serializer_class=serializers.Serializer)
     def audit(self, request, pk=None):
         """
         审核通过
@@ -162,19 +173,21 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         with transaction.atomic():
             obj.is_audited = True
             obj.auditor = request.user
+            obj.inout_date = timezone.now() # 也是审核日期
             obj.save()
-            update_inm(obj) # 更新库存
+            update_inm(obj)  # 更新库存
         return Response()
-    
+
 
 class IProductViewSet(ListModelMixin, GenericViewSet):
     """
     半成品库存表
     """
     perms_map = {'*': '*'}
-    queryset = IProduct.objects.select_related('material', 'warehouse', 'wproduct__subproduction_plan__production_plan__order')
+    queryset = IProduct.objects.select_related(
+        'material', 'warehouse', 'wproduct__subproduction_plan__production_plan__order')
     serializer_class = IProductListSerializer
     filterset_class = IProductFilterSet
     search_fields = []
     ordering_fields = ['create_time']
-    ordering = ['-create_time']
\ No newline at end of file
+    ordering = ['-create_time']
diff --git a/hb_server/apps/wpm/filters.py b/hb_server/apps/wpm/filters.py
index e47fec7..c8392d3 100644
--- a/hb_server/apps/wpm/filters.py
+++ b/hb_server/apps/wpm/filters.py
@@ -4,39 +4,50 @@ from apps.mtm.models import Material, Step
 from apps.wpm.services import WpmServies
 from .models import Operation, OperationMaterial, OperationRecord, WMaterial, WProduct
 
+
 class WMaterialFilterSet(filters.FilterSet):
 
     operation = filters.NumberFilter(method='filter_operation')
+
     class Meta:
         model = WMaterial
-        fields = ['material', 'subproduction_plan', 'subproduction_plan__process', 'subproduction_plan__workshop', 'operation']
+        fields = ['material', 'subproduction_plan', 'subproduction_plan__process',
+                  'subproduction_plan__workshop', 'operation']
 
     def filter_operation(self, queryset, name, value):
         operation = Operation.objects.get(pk=value)
         wproducts = WProduct.objects.filter(ow_wproduct__operation=value)
         step = operation.step
         if wproducts.exists():
-            subplans = WpmServies.get_subplans_queryset_from_wproducts(wproducts)
+            subplans = WpmServies.get_subplans_queryset_from_wproducts(
+                wproducts)
         else:
             subplans = WpmServies.get_subplans_queyset_from_step(step)
-        queryset = queryset.filter(subproduction_plan__in=subplans).exclude(material__type=Material.MA_TYPE_HALFGOOD)
+        queryset = queryset.filter(subproduction_plan__in=subplans).exclude(
+            material__type=Material.MA_TYPE_HALFGOOD)
         return queryset
 
 
 class WProductFilterSet(filters.FilterSet):
     tag = filters.CharFilter(method='filter_tag')
-    production_plan = filters.NumberFilter(field_name='subproduction_plan__production_plan')
+    production_plan = filters.NumberFilter(
+        field_name='subproduction_plan__production_plan')
+
     class Meta:
         model = WProduct
-        fields = ['step', 'subproduction_plan', 'material', 'step__process', 'act_state', 'material__type']
+        fields = ['step', 'subproduction_plan', 'material',
+                  'step__process', 'act_state', 'material__type']
 
     def filter_tag(self, queryset, name, value):
         if value == 'no_scrap':
             queryset = queryset.exclude(act_state=WProduct.WPR_ACT_STATE_SCRAP)
         return queryset
 
+
 class CuttingFilterSet(filters.FilterSet):
-    production_plan = filters.NumberFilter(field_name='subproduction_plan__production_plan')
+    production_plan = filters.NumberFilter(
+        field_name='subproduction_plan__production_plan')
+
     class Meta:
         model = OperationMaterial
         fields = ['operation', 'subproduction_plan', 'material']
@@ -44,10 +55,11 @@ class CuttingFilterSet(filters.FilterSet):
 
 class OperationRecordFilterSet(filters.FilterSet):
     wproduct = filters.NumberFilter(method='filter_wproduct')
+
     class Meta:
         model = OperationRecord
         fields = ['operation', 'form']
-    
+
     def filter_wproduct(self, queryset, name, value):
         queryset = queryset.filter(operation__ow_operation__wproduct__id=value)
-        return queryset
\ No newline at end of file
+        return queryset
diff --git a/hb_server/apps/wpm/models.py b/hb_server/apps/wpm/models.py
index 4ecb946..dd870b4 100644
--- a/hb_server/apps/wpm/models.py
+++ b/hb_server/apps/wpm/models.py
@@ -13,15 +13,20 @@ from utils.model import SoftModel, BaseModel
 from simple_history.models import HistoricalRecords
 from apps.mtm.models import Material, Process, RecordFormField, Step, RecordForm, SubprodctionMaterial
 from apps.em.models import Equipment
+
+
 class WMaterial(BaseModel):
     """
     车间生产物料
     """
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子计划', on_delete=models.CASCADE)
-    material = models.ForeignKey(Material, verbose_name='关联物料', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='关联子计划', on_delete=models.CASCADE)
+    material = models.ForeignKey(
+        Material, verbose_name='关联物料', on_delete=models.CASCADE)
     batch = models.CharField('批次号', max_length=100, null=True, blank=True)
     count = models.PositiveIntegerField('当前数量', default=0)
 
+
 class WProduct(CommonAModel):
     """
     动态半成品/成品表
@@ -37,7 +42,7 @@ class WProduct(CommonAModel):
     WPR_ACT_STATE_TOFINALTEST = 60
     WPR_ACT_STATE_SCRAP = 70
     WPR_ACT_STATE_SELLED = 80
-    act_state_choices=(
+    act_state_choices = (
         (WPR_ACT_STATE_TORETEST, '待复检'),
         (WPR_ACT_STATE_DOWAIT, '操作准备中'),
         (WPR_ACT_STATE_DOING, '操作进行中'),
@@ -69,7 +74,7 @@ class WProduct(CommonAModel):
     NG_DOWN = 60
     NG_BACK_FROM = 70
     NG_RECALL = 80
-    
+
     ng_choices = (
         (NG_BACK_WORK, '返工'),
         (NG_BACK_FIX, '返修'),
@@ -80,29 +85,39 @@ class WProduct(CommonAModel):
         (NG_BACK_FROM, '退回供方'),
         (NG_RECALL, '召回')
     )
-    number = models.CharField('物品编号', unique=True, null=True, blank=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
-    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True, on_delete=models.CASCADE, related_name='w_pre_step')
-    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True, related_name='w_step')
-    act_state = models.IntegerField('进行状态', default=0, choices=act_state_choices)
+    number = models.CharField(
+        '物品编号', unique=True, null=True, blank=True, max_length=50)
+    material = models.ForeignKey(
+        Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
+    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True,
+                                 on_delete=models.CASCADE, related_name='w_pre_step')
+    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True,
+                             related_name='w_step')
+    act_state = models.IntegerField(
+        '进行状态', default=0, choices=act_state_choices)
     is_hidden = models.BooleanField('是否隐藏', default=False)
-    child = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE, related_name='wproduct_child')
+    child = models.ForeignKey('self', blank=True, null=True,
+                              on_delete=models.CASCADE, related_name='wproduct_child')
     remark = models.CharField('备注', max_length=200, null=True, blank=True)
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE, related_name='wproduct_subplan')
-    
-    scrap_reason = models.IntegerField('报废原因', choices=scrap_reason_choices, null=True, blank=True)
-    ng_sign = models.PositiveSmallIntegerField('不合格标记', choices=ng_choices, null=True, blank=True)
+    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE,
+                                           related_name='wproduct_subplan')
 
-    warehouse = models.ForeignKey(WareHouse, verbose_name='所在仓库', on_delete=models.SET_NULL, null=True, blank=True)
+    scrap_reason = models.IntegerField(
+        '报废原因', choices=scrap_reason_choices, null=True, blank=True)
+    ng_sign = models.PositiveSmallIntegerField(
+        '不合格标记', choices=ng_choices, 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='当前工单', 
-        on_delete=models.SET_NULL, null=True, blank=True, related_name='wp_ticket')
+    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='当前工单',
+                               on_delete=models.SET_NULL, null=True, blank=True, related_name='wp_ticket')
 
     is_mtested = models.BooleanField('是否军检', default=False)
     is_mtestok = models.BooleanField('是否军检合格', null=True, blank=True)
@@ -115,50 +130,68 @@ class WProduct(CommonAModel):
         最后提交的工序自检
         """
         return self.test_wproduct.filter(type=TestRecord.TEST_PROCESS, is_submited=True).order_by('-id').first()
-        
+
 
 class WprouctTicket(CommonAModel):
     """
     玻璃审批工单
     """
-    
+
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
-    wproduct = models.ForeignKey(WProduct, verbose_name='关联产品', on_delete=models.CASCADE)
-    material = models.ForeignKey(Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
-    step = models.ForeignKey(Step, verbose_name='所在步骤/发现步骤', on_delete=models.CASCADE)
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
-    
-    resp_process = models.ForeignKey(Process, verbose_name='责任工序', on_delete=models.CASCADE, null=True, blank=True)
-    ticket = models.ForeignKey('wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
-    decision = models.PositiveSmallIntegerField('最终决定', choices=WProduct.ng_choices, null=True, blank=True)
+    wproduct = models.ForeignKey(
+        WProduct, verbose_name='关联产品', on_delete=models.CASCADE)
+    material = models.ForeignKey(
+        Material, verbose_name='所在物料状态', on_delete=models.CASCADE)
+    step = models.ForeignKey(
+        Step, verbose_name='所在步骤/发现步骤', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='所在子生产计划', on_delete=models.CASCADE)
+
+    resp_process = models.ForeignKey(
+        Process, verbose_name='责任工序', on_delete=models.CASCADE, null=True, blank=True)
+    ticket = models.ForeignKey(
+        'wf.ticket', verbose_name='关联工单', on_delete=models.CASCADE, related_name='wt_ticket')
+    decision = models.PositiveSmallIntegerField(
+        '最终决定', choices=WProduct.ng_choices, null=True, blank=True)
+
 
 class WproductFlow(CommonAModel):
     """
     动态产品表日志
     """
-    wproduct = models.ForeignKey(WProduct, on_delete=models.CASCADE, verbose_name='关联产品', null=True, blank=True)
+    wproduct = models.ForeignKey(
+        WProduct, on_delete=models.CASCADE, verbose_name='关联产品', null=True, blank=True)
     number = models.CharField('物品编号', null=True, blank=True, max_length=50)
-    material = models.ForeignKey(Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
-    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True, on_delete=models.CASCADE, related_name='wl_pre_step')
-    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True, related_name='wl_step')
-    act_state = models.IntegerField('进行状态', default=0, choices=WProduct.act_state_choices)
+    material = models.ForeignKey(
+        Material, verbose_name='所属物料状态', on_delete=models.CASCADE)
+    pre_step = models.ForeignKey(Step, verbose_name='已执行到', help_text='已执行完的步骤', null=True, blank=True,
+                                 on_delete=models.CASCADE, related_name='wl_pre_step')
+    step = models.ForeignKey(Step, verbose_name='所在步骤', on_delete=models.CASCADE, null=True, blank=True,
+                             related_name='wl_step')
+    act_state = models.IntegerField(
+        '进行状态', default=0, choices=WProduct.act_state_choices)
     is_hidden = models.BooleanField('是否隐藏', default=False)
-    child = models.ForeignKey('self', blank=True, null=True, on_delete=models.CASCADE, related_name='wproduct_child')
+    child = models.ForeignKey('self', blank=True, null=True,
+                              on_delete=models.CASCADE, related_name='wproduct_child')
     remark = models.CharField('备注', max_length=200, null=True, blank=True)
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='当前子生产计划', on_delete=models.CASCADE)
 
-    scrap_reason = models.IntegerField('报废原因', choices= WProduct.scrap_reason_choices, null=True, blank=True)
-    ng_sign = models.PositiveSmallIntegerField('不合格标记', choices= WProduct.ng_choices, null=True, blank=True)
+    scrap_reason = models.IntegerField(
+        '报废原因', choices=WProduct.scrap_reason_choices, null=True, blank=True)
+    ng_sign = models.PositiveSmallIntegerField(
+        '不合格标记', choices=WProduct.ng_choices, null=True, blank=True)
 
-    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='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='当前工单', 
-        on_delete=models.SET_NULL, null=True, blank=True)
+    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='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='当前工单',
+                               on_delete=models.SET_NULL, null=True, blank=True)
 
     is_mtested = models.BooleanField('是否军检', default=False)
     is_mtestok = models.BooleanField('是否军检合格', null=True, blank=True)
@@ -179,65 +212,88 @@ class Pick(CommonADModel):
         (PICK_FROM_WAREHOUSE, '仓库领取'),
         (PICK_FROM_WPRODUCT, '半成品领取'),
     )
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE)
-    type = models.PositiveSmallIntegerField(choices=type_choice, default=PICK_FROM_WAREHOUSE)
-    fifo = models.ForeignKey(FIFO, verbose_name='关联的出入库记录', on_delete=models.CASCADE, null=True, blank=True)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE)
+    type = models.PositiveSmallIntegerField(
+        choices=type_choice, default=PICK_FROM_WAREHOUSE)
+    fifo = models.ForeignKey(
+        FIFO, verbose_name='关联的出入库记录', on_delete=models.CASCADE, null=True, blank=True)
+
 
 class PickWproduct(BaseModel):
     """
     领取半成品时详情
     """
-    pick = models.ForeignKey(Pick, verbose_name='关联领料', on_delete=models.CASCADE)
-    wproduct = models.ForeignKey(WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='pw_wproduct')
+    pick = models.ForeignKey(Pick, verbose_name='关联领料',
+                             on_delete=models.CASCADE)
+    wproduct = models.ForeignKey(
+        WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='pw_wproduct')
     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)
+    material = models.ForeignKey(
+        Material, verbose_name='领取时的物料状态', on_delete=models.CASCADE)
+    subproduction_plan = models.ForeignKey(
+        SubProductionPlan, verbose_name='领取时所属子生产计划', on_delete=models.CASCADE)
+
 
 class Operation(CommonADModel):
     """
     生产操作
     """
-    step = models.ForeignKey(Step, verbose_name='操作步骤', on_delete=models.CASCADE, null=True, blank=True)
+    step = models.ForeignKey(Step, verbose_name='操作步骤',
+                             on_delete=models.CASCADE, null=True, blank=True)
     remark = models.CharField('操作备注', max_length=200, null=True, blank=True)
     is_submited = models.BooleanField('是否提交', default=False)
 
+
 class OperationWproduct(BaseModel):
     """
     生产操作半成品关联表
     """
-    operation = models.ForeignKey(Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='ow_operation')
-    wproduct = models.ForeignKey(WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='ow_wproduct')
+    operation = models.ForeignKey(
+        Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='ow_operation')
+    wproduct = models.ForeignKey(
+        WProduct, verbose_name='关联半成品', on_delete=models.CASCADE, related_name='ow_wproduct')
     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)
+    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)
     place = models.CharField('摆放位置', null=True, blank=True, max_length=200)
+
     class Meta:
         unique_together = (
-            ('operation','wproduct')
+            ('operation', 'wproduct')
         )
 
+
 class OperationMaterial(BaseModel):
     """
     生产操作物料消耗产出表
     """
-    type = models.IntegerField('类型', default=0, choices=SubprodctionMaterial.type_choices)
-    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE, related_name='om_operation')
-    
-    material = models.ForeignKey(Material, verbose_name='可能产出的产品', on_delete=models.CASCADE, 
-                null=True, blank=True, related_name='om_material')
+    type = models.IntegerField(
+        '类型', default=0, choices=SubprodctionMaterial.type_choices)
+    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE,
+                                  related_name='om_operation')
+
+    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)
-    subproduction_progress = models.ForeignKey(SubProductionProgress, verbose_name='关联的生产进度', on_delete=models.CASCADE, null=True, blank=True)
+    wmaterial = models.ForeignKey(
+        WMaterial, verbose_name='关联的车间物料', on_delete=models.CASCADE, null=True, blank=True)
+    subproduction_progress = models.ForeignKey(SubProductionProgress, verbose_name='关联的生产进度', on_delete=models.CASCADE,
+                                               null=True, blank=True)
 
-    subproduction_plan = models.ForeignKey(SubProductionPlan, verbose_name='关联的子计划', on_delete=models.CASCADE, null=True, blank=True)
+    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_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)
@@ -246,29 +302,38 @@ 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')
+            ('operation', 'material', 'batch')
         )
 
+
 class OperationRecord(BaseModel):
     """
     记录表格
     """
-    form = models.ForeignKey(RecordForm, verbose_name='所用的生产记录表格', on_delete=models.CASCADE, related_name='or_form')
-    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE, related_name='or_operation')
+    form = models.ForeignKey(RecordForm, verbose_name='所用的生产记录表格',
+                             on_delete=models.CASCADE, related_name='or_form')
+    operation = models.ForeignKey(Operation, verbose_name='关联的生产操作', on_delete=models.CASCADE,
+                                  related_name='or_operation')
     is_filled = models.BooleanField('是否填写', default=True)
 
+
 class OperationRecordItem(BaseModel):
     """
     记录表格字段值
     """
-    form_field = models.ForeignKey(RecordFormField, verbose_name='关联字段', on_delete=models.CASCADE, related_name='ori_form_field')
+    form_field = models.ForeignKey(RecordFormField, verbose_name='关联字段', on_delete=models.CASCADE,
+                                   related_name='ori_form_field')
     field_value = models.JSONField('录入值', null=True, blank=True)
-    operation_record = models.ForeignKey(OperationRecord, verbose_name='关联的生产记录', on_delete=models.CASCADE, related_name='item_operation_record')
+    operation_record = models.ForeignKey(OperationRecord, verbose_name='关联的生产记录', on_delete=models.CASCADE,
+                                         related_name='item_operation_record')
+
 
 class OperationEquip(BaseModel):
-    operation = models.ForeignKey(Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='oe_operation')
-    equip = models.ForeignKey(Equipment, verbose_name='生产设备', on_delete=models.CASCADE, related_name='oe_equip')
-    remark = models.TextField('备注', null=True, blank=True)
\ No newline at end of file
+    operation = models.ForeignKey(
+        Operation, verbose_name='关联操作', on_delete=models.CASCADE, related_name='oe_operation')
+    equip = models.ForeignKey(Equipment, verbose_name='生产设备',
+                              on_delete=models.CASCADE, related_name='oe_equip')
+    remark = models.TextField('备注', null=True, blank=True)
diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py
index 95a9e2d..d9f09dd 100644
--- a/hb_server/apps/wpm/serializers.py
+++ b/hb_server/apps/wpm/serializers.py
@@ -418,12 +418,12 @@ class WplanPutInSerializer(serializers.Serializer):
 
 class WproductPutInSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
-    remark = serializers.CharField(label="入库备注", required =False)
+    remark = serializers.CharField(label="入库备注", required =False, default="")
 
 class WproductPutInsSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
     wproducts = serializers.PrimaryKeyRelatedField(queryset=WProduct.objects.all(), label='半成品ID', many=True)
-    remark = serializers.CharField(label="入库备注", required =False, allow_null=True)
+    remark = serializers.CharField(label="入库备注", required =False, default="")
 
 
 class OperationEquipListSerializer(serializers.Serializer):
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 8aee33d..0920983 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -1,66 +1,77 @@
-from django.db.models.expressions import F
-from django.shortcuts import render
 from rest_framework.generics import CreateAPIView, GenericAPIView
-from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, ListModelMixin, RetrieveModelMixin, UpdateModelMixin
-from rest_framework.utils import serializer_helpers
-from rest_framework.utils.field_mapping import get_relation_kwargs
-from rest_framework.views import APIView
-from rest_framework.viewsets import GenericViewSet, ModelViewSet
-from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, WareHouse
+from rest_framework.mixins import CreateModelMixin, DestroyModelMixin, \
+    ListModelMixin, RetrieveModelMixin, UpdateModelMixin
+from rest_framework.viewsets import GenericViewSet
+from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct
 from apps.inm.signals import update_inm
 from apps.mtm.models import Material, RecordForm, RecordFormField, Step, SubprodctionMaterial, TechDoc
 from apps.mtm.serializers import RecordFormDetailSerializer, SubprodctionMaterialListSerializer, TechDocListSerializer
 from apps.pm.models import SubProductionPlan, SubProductionProgress
-from apps.pm.serializers import SubProductionPlanListSerializer, SubProductionPlanUpdateSerializer, SubProductionProgressSerializer
+from apps.pm.serializers import SubProductionPlanListSerializer, SubProductionProgressSerializer
 from apps.qm.models import TestRecord, TestRecordItem
 from apps.qm.serializers import TestRecordDetailSerializer
 
-from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
+from apps.system.mixins import CreateUpdateModelAMixin
 from rest_framework.decorators import action
 from apps.wf.models import Workflow
-from apps.wf.serializers import WorkflowSimpleSerializer
 from apps.wpm.filters import CuttingFilterSet, OperationRecordFilterSet, WMaterialFilterSet, WProductFilterSet
-from apps.wpm.models import OperationEquip, OperationWproduct, Pick, PickWproduct, WMaterial, WProduct, Operation, OperationMaterial, OperationRecord, OperationRecordItem, WprouctTicket
+from apps.wpm.models import OperationEquip, OperationWproduct, Pick, PickWproduct, WMaterial, WProduct, Operation, \
+    OperationMaterial, OperationRecord, OperationRecordItem, WprouctTicket
+
+from apps.wpm.serializers import CuttingListSerializer, OperationEquipListSerializer, OperationEquipUpdateSerializer, \
+    OperationMaterialCreate1ListSerailizer, OperationMaterialCreate1Serailizer, OperationMaterialCreate2ListSerailizer, \
+    OperationMaterialCreate2Serailizer, OperationMaterialCreate3Serializer, OperationMaterialListSerializer, \
+    OperationRecordDetailSerializer, OperationRecordListSerializer, OperationRecordSubmitSerializer, \
+    OperationUpdateSerializer, OperationWproductListSerializer, OperationCreateSerializer, OperationDetailSerializer, \
+    OperationListSerializer, OperationWproductUpdateSerializer, PickHalfsSerializer, \
+    PickSerializer, OperationInitSerializer, OperationSubmitSerializer, ScrapSerializer, WMaterialListSerializer, \
+    WProductCardSerializer, WProductDetailSerializer, WProductListSerializer, \
+    WpmTestFormInitSerializer, WproductMtestSerializer, WproductPutInSerializer, \
+    WproductPutInsSerializer, WproductTicketListSerializer
 
-from apps.wpm.serializers import CuttingListSerializer, OperationEquipListSerializer, OperationEquipUpdateSerializer, OperationMaterialCreate1ListSerailizer, OperationMaterialCreate1Serailizer, OperationMaterialCreate2ListSerailizer, OperationMaterialCreate2Serailizer, OperationMaterialCreate3Serializer, OperationMaterialListSerializer, OperationRecordDetailSerializer, OperationRecordListSerializer, OperationRecordSubmitSerializer, OperationUpdateSerializer, OperationWproductListSerializer, OperationCreateSerializer, OperationDetailSerializer, OperationListSerializer, OperationWproductUpdateSerializer, PickHalfSerializer, PickHalfsSerializer, PickSerializer, OperationInitSerializer, OperationSubmitSerializer, ScrapSerializer, WMaterialListSerializer, WProductCardSerializer, WProductDetailSerializer, WProductListSerializer, WplanPutInSerializer, WpmTestFormInitSerializer, WpmTestRecordCreateSerializer, WproductMtestSerializer, WproductPutInSerializer, WproductPutInsSerializer, WproductTicketListSerializer
 from rest_framework.response import Response
 from django.db import transaction
 from rest_framework import exceptions, serializers
-
 from apps.wpm.services import WpmServies
 from django.utils import timezone
-from utils.tools import ranstr
 from rest_framework import status
 from django.db.models import Count
+
+
 # Create your views here.
+
+
 class WPlanViewSet(ListModelMixin, GenericViewSet):
     """
     车间生产计划
     """
     perms_map = {'*': '*'}
-    queryset = SubProductionPlan.objects.select_related('process', 'workshop', 'subproduction', 'product').exclude(state=0)
+    queryset = SubProductionPlan.objects.select_related(
+        'process', 'workshop', 'subproduction', 'product').exclude(state=0)
     search_fields = []
     serializer_class = SubProductionPlanListSerializer
-    filterset_fields = ['production_plan', 'process', 'state', 'product', 'workshop']
+    filterset_fields = ['production_plan',
+                        'process', 'state', 'product', 'workshop']
     ordering_fields = []
     ordering = ['-update_time']
 
-    @action(methods=['post', 'get'], detail=True, perms_map={'post':'*', 'get':'*'}, serializer_class=PickHalfsSerializer)
+    @action(methods=['post', 'get'], detail=True, perms_map={'post': '*', 'get': '*'}, serializer_class=PickHalfsSerializer)
     @transaction.atomic
     def pick_half(self, request, pk=None):
         """
         领半成品
         """
         sp = self.get_object()
-        if request.method=='GET':
+        if request.method == 'GET':
             """
             领半成品
             """
-            spps = SubProductionProgress.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN, 
-                material__type=Material.MA_TYPE_HALFGOOD, subproduction_plan=sp).select_related('material')
+            spps = SubProductionProgress.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN,
+                                                        material__type=Material.MA_TYPE_HALFGOOD,
+                                                        subproduction_plan=sp).select_related('material')
             return Response(SubProductionProgressSerializer(instance=spps, many=True).data)
-        elif request.method=='POST':
-            serializer= PickHalfsSerializer(data=request.data)
+        elif request.method == 'POST':
+            serializer = PickHalfsSerializer(data=request.data)
             serializer.is_valid(raise_exception=True)
             vdata = serializer.validated_data
             first_step = Step.objects.get(pk=sp.steps[0]['id'])
@@ -71,17 +82,18 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
             pick.create_by = request.user
             pick.save()
             for i in vdata:
-                if 'wproducts' in i and len(i['wproducts'])>0:
+                if 'wproducts' in i and len(i['wproducts']) > 0:
                     spp = i['id']
                     spp.count_pick = spp.count_pick + len(i['wproducts'])
                     # if spp.count_pick > spp.count:
                     #     raise exceptions.APIException('超过计划数')
                     spp.save()
-                    wps = WProduct.objects.filter(pk__in=[x.id for x in i['wproducts']], act_state=WProduct.WPR_ACT_STATE_OK)
-                    wps.update(step=first_step, 
-                    act_state=WProduct.WPR_ACT_STATE_TORETEST, is_hidden=False, warehouse=None,
-                    subproduction_plan=sp, update_by=request.user, update_time=timezone.now())
-                    
+                    wps = WProduct.objects.filter(
+                        pk__in=[x.id for x in i['wproducts']], act_state=WProduct.WPR_ACT_STATE_OK)
+                    wps.update(step=first_step,
+                               act_state=WProduct.WPR_ACT_STATE_TORETEST, is_hidden=False, warehouse=None,
+                               subproduction_plan=sp, update_by=request.user, update_time=timezone.now())
+
                     for m in i['wproducts']:
                         m.step = first_step
                         m.act_state = WProduct.WPR_ACT_STATE_TORETEST
@@ -91,9 +103,10 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
                         m.update_by = request.user
                         m.update_time = timezone.now()
                         m.save()
-                        WpmServies.add_wproduct_flow_log(instance=m, change_str='pick_half')
+                        WpmServies.add_wproduct_flow_log(
+                            instance=m, change_str='pick_half')
                         pw = PickWproduct()
-                        pw.pick =pick
+                        pw.pick = pick
                         pw.wproduct = m
                         pw.number = m.number
                         pw.material = m.material
@@ -101,103 +114,47 @@ class WPlanViewSet(ListModelMixin, GenericViewSet):
                         pw.save()
             sp.is_picked = True
             sp.save()
-            
-            return Response()
-        
 
-    # @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=WplanPutInSerializer)
-    # @transaction.atomic
-    # def putin(self, request, pk=None):
-    #     """
-    #     半成品入库
-    #     """
-    #     serializer= WplanPutInSerializer(data=request.data)
-    #     serializer.is_valid(raise_exception=True)
-    #     vdata = serializer.validated_data
-    #     subplan = self.get_object()
-    #     material = subplan.product
-    #     batch = subplan.number
-    #     warehouse = vdata['warehouse']
-    #     wproducts = WProduct.objects.filter(subproduction_plan=subplan, 
-    #         act_state=WProduct.WPR_ACT_STATE_OK, material=material, is_deleted=False)
-    #     if wproducts.exists():
-    #         # 创建入库记录
-    #         remark = vdata.get('remark', '')
-    #         fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_IN,
-    #             is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
-    #         # 创建入库明细
-    #         fifoitem = FIFOItem()
-    #         fifoitem.is_tested = True
-    #         fifoitem.is_testok = True
-    #         fifoitem.warehouse = warehouse 
-    #         fifoitem.material = material
-    #         fifoitem.count = wproducts.count()
-    #         fifoitem.batch = batch
-    #         fifoitem.fifo = fifo
-    #         fifoitem.subproduction_plan = subplan
-    #         fifoitem.save()
-    #         # 创建入库明细半成品
-    #         ips = []
-    #         for i in wproducts:
-    #             ip = {}
-    #             ip['fifoitem'] = fifoitem
-    #             ip['wproduct'] = i
-    #             ip['number'] = i.number
-    #             ip['material'] = material
-    #             ips.append(FIFOItemProduct(**ip))
-    #         FIFOItemProduct.objects.bulk_create(ips)
-    #         # 创建IProduct
-    #         ips2 = []
-    #         for i in wproducts:
-    #             ip = {}
-    #             ip['warehouse'] = warehouse
-    #             ip['batch'] = batch
-    #             ip['wproduct'] = i
-    #             ip['number'] = i.number
-    #             ip['material'] = material
-    #             ips2.append(IProduct(**ip))
-    #         IProduct.objects.bulk_create(ips2)
-    #         # 更新库存并修改半成品进行状态
-    #         update_inm(fifo)
-    #         wproducts.update(act_sate=WProduct.WPR_ACT_STATE_INM, warehouse=warehouse, update_by=request.user, update_time=timezone.now())
-            
-    #     return Response()
+            return Response()
 
 
 class WMaterialViewSet(CreateUpdateModelAMixin, ListModelMixin, GenericViewSet):
     """
     车间物料表
     """
-    perms_map={'*':'*'}
-    queryset = WMaterial.objects.select_related('material', 'subproduction_plan').filter(count__gt=0)
+    perms_map = {'*': '*'}
+    queryset = WMaterial.objects.select_related(
+        'material', 'subproduction_plan').filter(count__gt=0)
     serializer_class = WMaterialListSerializer
     filterset_class = WMaterialFilterSet
     ordering_fields = ['material__number']
     ordering = ['material__number']
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=PickSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=PickSerializer)
     def pick(self, request, pk=None):
         """
         领料
         """
-        serializer= PickSerializer(data=request.data, context={'request': request})
+        serializer = PickSerializer(
+            data=request.data, context={'request': request})
         serializer.is_valid(raise_exception=True)
         serializer.save()
         return Response()
 
+
 class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
     """
     半成品
     """
-    perms_map={'*':'*'}
-    queryset = WProduct.objects.select_related('step', 'material', 
-                'subproduction_plan', 'warehouse').prefetch_related('wproduct_child')
+    perms_map = {'*': '*'}
+    queryset = WProduct.objects.select_related('step', 'material',
+                                               'subproduction_plan', 'warehouse').prefetch_related('wproduct_child')
     serializer_class = WProductListSerializer
     filterset_class = WProductFilterSet
     search_fields = ['number']
     ordering_fields = ['id']
     ordering = ['id']
-    
+
     def get_serializer_class(self):
         if self.action == 'retrieve':
             return WProductDetailSerializer
@@ -209,7 +166,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             queryset = queryset.filter(is_hidden=False)
         return queryset
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=WpmTestFormInitSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=WpmTestFormInitSerializer)
     @transaction.atomic
     def test_init(self, request, pk=None):
         """
@@ -224,18 +181,19 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             raise exceptions.APIException('存在进行中检验')
 
         # 根据情况创建一条检验记录
-        if wproduct.act_state not in [WProduct.WPR_ACT_STATE_TOTEST, 
-                                    WProduct.WPR_ACT_STATE_TORETEST, WProduct.WPR_ACT_STATE_TOFINALTEST, WProduct.WPR_ACT_STATE_TOCOMBTEST]:
+        if wproduct.act_state not in [WProduct.WPR_ACT_STATE_TOTEST,
+                                      WProduct.WPR_ACT_STATE_TORETEST, WProduct.WPR_ACT_STATE_TOFINALTEST,
+                                      WProduct.WPR_ACT_STATE_TOCOMBTEST]:
             raise exceptions.APIException('该产品当前状态不可检验')
-        
+
         savedict = dict(
-            create_by = self.request.user, 
+            create_by=self.request.user,
             wproduct=wproduct,
-        material=wproduct.material, 
-        number=wproduct.number, 
-        subproduction_plan=wproduct.subproduction_plan, 
-        step=wproduct.step,
-        form=form)
+            material=wproduct.material,
+            number=wproduct.number,
+            subproduction_plan=wproduct.subproduction_plan,
+            step=wproduct.step,
+            form=form)
         if wproduct.act_state == WProduct.WPR_ACT_STATE_TORETEST:
             # 查找最近一条检验记录
             trs = wproduct.last_process_test
@@ -263,26 +221,29 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             tri.save()
         return Response(TestRecordDetailSerializer(instance=tr).data)
 
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=WproductPutInsSerializer)
+    @action(methods=['post'], detail=False, perms_map={'post': '*'}, serializer_class=WproductPutInsSerializer)
     @transaction.atomic
     def putins(self, request, pk=None):
         """
         半成品批量入库
         """
-        serializer= WproductPutInsSerializer(data=request.data)
+        serializer = WproductPutInsSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         vdata = serializer.validated_data
-        wproducts = WProduct.objects.filter(pk__in=[x.id for x in vdata['wproducts']])
+        wproducts = WProduct.objects.filter(
+            pk__in=[x.id for x in vdata['wproducts']])
         warehouse = vdata['warehouse']
         for i in wproducts:
             if i.act_state is not WProduct.WPR_ACT_STATE_OK:
                 raise exceptions.APIException('存在不可入库半成品')
         # 聚合一下
-        wproducts_a = wproducts.values('subproduction_plan', 'material', 'subproduction_plan__number').annotate(total=Count('id'))
+        wproducts_a = wproducts.values(
+            'subproduction_plan', 'material', 'subproduction_plan__number').annotate(total=Count('id'))
         # 创建入库记录
         remark = vdata.get('remark', '')
         fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_IN,
-            is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
+                                   is_audited=True, auditor=request.user, inout_date=timezone.now(),
+                                   create_by=request.user, remark=remark)
         # 创建入库明细
         for i in wproducts_a:
             spi = SubProductionPlan.objects.get(pk=i['subproduction_plan'])
@@ -297,9 +258,10 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             fifoitem.subproduction_plan = spi
             fifoitem.save()
 
-            wproducts_items = wproducts.filter(subproduction_plan=i['subproduction_plan'], material=i['material'])
+            wproducts_items = wproducts.filter(
+                subproduction_plan=i['subproduction_plan'], material=i['material'])
             ips = []
-            for i in wproducts_items:       
+            for i in wproducts_items:
                 # 创建入库明细半成品
                 ip = {}
                 ip['fifoitem'] = fifoitem
@@ -318,14 +280,14 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             i.save()
             WpmServies.add_wproduct_flow_log(i, 'putins')
         return Response()
-    
-    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=WproductPutInSerializer)
+
+    @action(methods=['post'], detail=True, perms_map={'post': '*'}, serializer_class=WproductPutInSerializer)
     @transaction.atomic
     def putin(self, request, pk=None):
         """
         半成品入库
         """
-        serializer= WproductPutInSerializer(data=request.data)
+        serializer = WproductPutInSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         vdata = serializer.validated_data
         wproduct = self.get_object()
@@ -337,14 +299,15 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         # 创建入库记录
         remark = vdata.get('remark', '')
         fifo = FIFO.objects.create(type=FIFO.FIFO_TYPE_DO_IN,
-            is_audited=True, auditor=request.user, inout_date=timezone.now(), create_by=request.user, remark=remark)
+                                   is_audited=True, auditor=request.user, inout_date=timezone.now(),
+                                   create_by=request.user, remark=remark)
         # 创建入库明细
         fifoitem = FIFOItem()
         fifoitem.is_tested = True
         fifoitem.is_testok = True
         fifoitem.warehouse = warehouse
         fifoitem.material = material
-        fifoitem.count = 1 # 单个半成品入库
+        fifoitem.count = 1  # 单个半成品入库
         fifoitem.batch = batch
         fifoitem.fifo = fifo
         fifoitem.subproduction_plan = wproduct.subproduction_plan
@@ -361,13 +324,13 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         FIFOItemProduct.objects.bulk_create(ips)
         # 更新库存并修改半成品进行状态
         update_inm(fifo)
-        wproduct.act_state=WProduct.WPR_ACT_STATE_INM
-        wproduct.warehouse=warehouse
+        wproduct.act_state = WProduct.WPR_ACT_STATE_INM
+        wproduct.warehouse = warehouse
         wproduct.save()
         WpmServies.add_wproduct_flow_log(wproduct, 'putin')
         return Response()
 
-    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=ScrapSerializer)
+    @action(methods=['post'], detail=True, perms_map={'post': '*'}, serializer_class=ScrapSerializer)
     def scrap(self, request, pk=None):
         """
         报废操作
@@ -379,7 +342,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         if obj.act_state == WProduct.WPR_ACT_STATE_NOTOK:
             pass
         elif obj.step.process.id == 1 and \
-            obj.act_state in [WProduct.WPR_ACT_STATE_DOWAIT, WProduct.WPR_ACT_STATE_TOTEST]: # 如果是冷加工可直接报废
+                obj.act_state in [WProduct.WPR_ACT_STATE_DOWAIT, WProduct.WPR_ACT_STATE_TOTEST]:  # 如果是冷加工可直接报废
             if vdata.get('scrap_reason', None):
                 obj.scrap_reason = vdata['scrap_reason']
             else:
@@ -391,7 +354,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         obj.update_time = timezone.now()
         obj.save()
         WpmServies.add_wproduct_flow_log(obj, 'scrap')
-        if obj.step.process.id == 1: #如果是冷加工
+        if obj.step.process.id == 1:  # 如果是冷加工
             WpmServies.update_cutting_list_with_operation(obj.coperation)
         return Response()
 
@@ -403,34 +366,36 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
     #     wfs = Workflow.objects.filter(key__startswith= 'wp_')
     #     return WorkflowSimpleSerializer(instance=wfs, many=True).data
 
-    @action(methods=['get'], detail=True, perms_map={'get':'*'})
+    @action(methods=['get'], detail=True, perms_map={'get': '*'})
     def wf_bhg(self, request, pk=None):
         """
         发起不合格审理单
         """
         obj = self.get_object()
-        if obj.act_state != WProduct.WPR_ACT_STATE_NOTOK or obj.ng_sign is not None\
-            or obj.ticket is not None:
+        if obj.act_state != WProduct.WPR_ACT_STATE_NOTOK or obj.ng_sign is not None \
+                or obj.ticket is not None:
             raise exceptions.APIException('该产品不可发起不合格审理')
-        workflow = Workflow.objects.filter(name='不合格品审理单', is_deleted=False).first()
+        workflow = Workflow.objects.filter(
+            name='不合格品审理单', is_deleted=False).first()
         if workflow:
-            test_record = TestRecord.objects.filter(wproduct=obj, is_deleted=False, is_testok=False).order_by('-id').first()
+            test_record = TestRecord.objects.filter(
+                wproduct=obj, is_deleted=False, is_testok=False).order_by('-id').first()
             exist_data = {
-            'wproduct':obj.id,
-            'wproduct_number':obj.number,
-            'wproduct_name':obj.material.name,
-            'wproduct_specification':obj.material.specification,
-            'finder':request.user.id,
-            'find_process':obj.step.process.id, 
-            'tester':test_record.create_by.id
+                'wproduct': obj.id,
+                'wproduct_number': obj.number,
+                'wproduct_name': obj.material.name,
+                'wproduct_specification': obj.material.specification,
+                'finder': request.user.id,
+                'find_process': obj.step.process.id,
+                'tester': test_record.create_by.id
             }
-            ret = {'workflow':workflow.id}
+            ret = {'workflow': workflow.id}
             ret['exist_data'] = exist_data
             return Response(ret)
         else:
             raise exceptions.APIException('未找到对应审批流程')
-        
-    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=WproductMtestSerializer)
+
+    @action(methods=['post'], detail=True, perms_map={'post': '*'}, serializer_class=WproductMtestSerializer)
     @transaction.atomic
     def mtest(self, request, pk=None):
         """
@@ -446,7 +411,8 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         is_mtestok = request.data.get('is_mtestok')
         obj.is_mtestok = is_mtestok
         if is_mtestok:
-            WpmServies.update_plan_state_by_mtestok(obj.subproduction_plan.production_plan)
+            WpmServies.update_plan_state_by_mtestok(
+                obj.subproduction_plan.production_plan)
         obj.save()
         change_str = 'mtest_notok'
         if is_mtestok:
@@ -454,7 +420,7 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         WpmServies.add_wproduct_flow_log(instance=obj, change_str=change_str)
         return Response()
 
-    @action(methods=['get'], detail=True, perms_map={'get':'*'})
+    @action(methods=['get'], detail=True, perms_map={'get': '*'})
     def card(self, request, pk=None):
         """
         流程卡
@@ -469,35 +435,40 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
             ret.append(line1)
             steps_list_full_1 = card_data['parents'][0]['step_list_full']
             for index, item in enumerate(steps_list_full_1):
-                linex = [str(index+1), item['step_name']]
+                linex = [str(index + 1), item['step_name']]
                 for i in card_data['parents']:
                     linex.append(i['step_list_full'][index]['actions'])
                 ret.append(linex)
         ret.append(['序号', '工序', card_data['number']])
         step_list_full = card_data['step_list_full']
         for index, item in enumerate(step_list_full):
-            ret.append([str(index+1), item['step_name'], item['actions']])
+            ret.append([str(index + 1), item['step_name'], item['actions']])
         return Response(ret)
 
+
 class WproductTicketViewSet(ListModelMixin, GenericViewSet):
     """
     玻璃审批工单
     """
-    perms_map={'*':'*'}
-    queryset = WprouctTicket.objects.select_related('step', 'material', 'subproduction_plan', 
-    'resp_process', 'subproduction_plan__production_plan__order', 'subproduction_plan__production_plan')
+    perms_map = {'*': '*'}
+    queryset = WprouctTicket.objects.select_related('step', 'material', 'subproduction_plan',
+                                                    'resp_process', 'subproduction_plan__production_plan__order',
+                                                    'subproduction_plan__production_plan')
     serializer_class = WproductTicketListSerializer
-    filterset_fields = ['step', 'material', 'subproduction_plan', 'resp_process']
+    filterset_fields = ['step', 'material',
+                        'subproduction_plan', 'resp_process']
     ordering_fields = ['id']
     ordering = ['-id']
 
 
-class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin, GenericViewSet):
+class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, UpdateModelMixin, DestroyModelMixin,
+                       GenericViewSet):
     """
     生产操作记录
     """
-    perms_map={'*':'*'}
-    queryset = Operation.objects.select_related('step').prefetch_related('ow_operation', 'oe_operation', 'or_operation').all()
+    perms_map = {'*': '*'}
+    queryset = Operation.objects.select_related('step').prefetch_related(
+        'ow_operation', 'oe_operation', 'or_operation').all()
     serializer_class = OperationListSerializer
     filterset_fields = ['step', 'step__process', 'is_submited']
     ordering_fields = ['id']
@@ -537,9 +508,10 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
     @transaction.atomic
     def create(self, request, *args, **kwargs):
         data = request.data
-        serializer = OperationCreateSerializer(data=data, context={'request':self.request})
+        serializer = OperationCreateSerializer(
+            data=data, context={'request': self.request})
         serializer.is_valid(raise_exception=True)
-        vdata = serializer.validated_data #校验之后的数据
+        vdata = serializer.validated_data  # 校验之后的数据
         step = vdata['step']
         op = Operation()
         op.step = step
@@ -550,9 +522,10 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         # 创建操作所用半成品关联记录
         if 'wproducts' in vdata:
             owps = []
-            splans = WpmServies.get_subplans_queryset_from_wproducts(vdata['wproducts'])
+            splans = WpmServies.get_subplans_queryset_from_wproducts(
+                vdata['wproducts'])
             for wpd in vdata['wproducts']:
-                wpd.operation= op
+                wpd.operation = op
                 wpd.act_state = WProduct.WPR_ACT_STATE_DOING
                 wpd.update_by = request.user
                 wpd.save()
@@ -567,9 +540,11 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 owps.append(OperationWproduct(**owp))
             OperationWproduct.objects.bulk_create(owps)
         else:
-            splans = WpmServies.get_subplans_queryset_from_wproducts(vdata['wproducts'])
+            splans = WpmServies.get_subplans_queryset_from_wproducts(
+                vdata['wproducts'])
         # 查询需要填写的自定义表格
-        forms = RecordForm.objects.filter(step=step, type=RecordForm.RF_TYPE_DO, enabled=True)
+        forms = RecordForm.objects.filter(
+            step=step, type=RecordForm.RF_TYPE_DO, enabled=True)
         for i in forms:
             opr = OperationRecord()
             opr.operation = op
@@ -591,15 +566,16 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
             ope.save()
         # 查询所需的工具工装
         for i in SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL,
-                        subproduction__subplan_subprod__in = splans, is_deleted=False).distinct():
+                                                     subproduction__subplan_subprod__in=splans,
+                                                     is_deleted=False).distinct():
             opm = OperationMaterial()
             opm.operation = op
             opm.material = i.material
             opm.type = SubprodctionMaterial.SUB_MA_TYPE_TOOL
             opm.save()
         return Response()
-    
-    @action(methods=['post'], detail=True, perms_map={'post':'*'}, serializer_class=serializers.Serializer)
+
+    @action(methods=['post'], detail=True, perms_map={'post': '*'}, serializer_class=serializers.Serializer)
     @transaction.atomic
     def submit(self, request, pk=None):
         """
@@ -609,17 +585,18 @@ 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)
-        omos = OperationMaterial.objects.filter(operation=op, 
-                    type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
+        omis = OperationMaterial.objects.filter(operation=op,
+                                                type=SubprodctionMaterial.SUB_MA_TYPE_IN)
+        omos = OperationMaterial.objects.filter(operation=op,
+                                                type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
         # 校验消耗产出是否正确填写
         if op.step.type == Step.STEP_TYPE_DIV:
             sps_omi_l = omis.values_list('subproduction_plan', flat=True)
-            sps_omo_l = omos.filter(use_scrap=False).values_list('subproduction_plan', flat=True)
+            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)):
                 raise exceptions.APIException('消耗与产出不一致')
-            
+
         # 实际消耗物料校验
 
         # 检查自定义表单填写
@@ -629,18 +606,19 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
         for i in omis:
             # 更新车间物料
             i_wmat = i.wmaterial
-            i_wmat.count = i_wmat.count- i.count
+            i_wmat.count = i_wmat.count - i.count
             i_wmat.save()
             # 更新子计划物料消耗情况
             spp = SubProductionProgress.objects.get(subproduction_plan=i_wmat.subproduction_plan,
-                    material=i_wmat.material)
+                                                    material=i_wmat.material)
             spp.count_real = spp.count_real + i.count
             spp.save()
         # 更新产出
         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)
+                ins, _ = WMaterial.objects.get_or_create(
+                    subproduction_plan=i.subproduction_plan, material=i.material)
                 ins.count = ins.count + i.count
                 ins.save()
                 # 更新子计划物料产出情况
@@ -659,7 +637,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 wp.step = newstep
                 wp.pre_step = step
                 if hasNext:
-                    wp.act_state= WProduct.WPR_ACT_STATE_DOWAIT
+                    wp.act_state = WProduct.WPR_ACT_STATE_DOWAIT
                 else:
                     wp.act_state = WProduct.WPR_ACT_STATE_TOTEST
                     wp.material = wsp.product
@@ -678,23 +656,27 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 raise exceptions.APIException('请选择物料产出')
             for i in omos:
                 if i.subproduction_progress.is_main:
-                    newstep, _ = WpmServies.get_next_step(i.subproduction_plan, step)
+                    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, coperation=op)
+                               act_state=WProduct.WPR_ACT_STATE_DOWAIT, remark='',
+                               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, 'wproduct_create')
+                        WpmServies.add_wproduct_flow_log(
+                            ins, 'wproduct_create')
                     # 更新进度
-                    WpmServies.update_subproduction_progress_main(sp=i.subproduction_plan)              
+                    WpmServies.update_subproduction_progress_main(
+                        sp=i.subproduction_plan)
         elif step.type == Step.STEP_TYPE_COMB:
             oms_w = omos.filter(subproduction_progress__is_main=True)
             if len(oms_w) == 1:
                 oms_w = oms_w[0]
                 # 校验单片数量是否正确, 暂时未写
-                newstep, hasNext = WpmServies.get_next_step(oms_w.subproduction_plan, step)
+                newstep, hasNext = WpmServies.get_next_step(
+                    oms_w.subproduction_plan, step)
                 wproduct = WProduct()
                 wproduct.material = oms_w.material
                 wproduct.step = newstep
@@ -704,32 +686,34 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
                 else:
                     wproduct.act_state = WProduct.WPR_ACT_STATE_TOTEST
                     # 更新子计划进度
-                    WpmServies.update_subproduction_progress_main(sp=oms_w.subproduction_plan)
+                    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, '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())
+                wps = WProduct.objects.filter(ow_wproduct__operation=op)
+                wps.update(is_hidden=True, child=wproduct,
+                           update_by=request.user, update_time=timezone.now())
             else:
                 raise exceptions.APIException('产出物料未填写或填写错误')
         op.is_submited = True
         op.save()
 
         # 如果是冷加工
-        if step.process.id==1:
+        if step.process.id == 1:
             WpmServies.update_cutting_list_with_operation(op=op)
         return Response()
-        
 
 
 class OperationWproductViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, GenericViewSet):
     """
     操作使用的半成品
     """
-    perms_map={'*':'*'}
-    queryset = OperationWproduct.objects.select_related('subproduction_plan', 'material').all()
+    perms_map = {'*': '*'}
+    queryset = OperationWproduct.objects.select_related(
+        'subproduction_plan', 'material').all()
     serializer_class = OperationWproductListSerializer
     filterset_fields = ['material', 'subproduction_plan', 'operation']
     ordering_fields = ['id']
@@ -751,12 +735,14 @@ class OperationWproductViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMix
         wp.save()
         return Response()
 
+
 class OperationEquipViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, GenericViewSet):
     """
     操作使用的设备
     """
-    perms_map={'*':'*'}
-    queryset = OperationEquip.objects.select_related('operation', 'equip').all()
+    perms_map = {'*': '*'}
+    queryset = OperationEquip.objects.select_related(
+        'operation', 'equip').all()
     serializer_class = OperationEquipListSerializer
     filterset_fields = ['operation', 'equip']
     ordering_fields = ['id']
@@ -766,7 +752,7 @@ class OperationEquipViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin,
         if self.action == 'update':
             return OperationEquipUpdateSerializer
         return super().get_serializer_class()
-    
+
     def update(self, request, *args, **kwargs):
         instance = self.get_object()
         if instance.operation.is_submited:
@@ -781,12 +767,14 @@ class OperationEquipViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin,
         instance.delete()
         return Response()
 
+
 class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, RetrieveModelMixin, GenericViewSet):
     """
     操作使用的自定义表格
     """
-    perms_map={'*':'*'}
-    queryset = OperationRecord.objects.select_related('operation', 'form').all()
+    perms_map = {'*': '*'}
+    queryset = OperationRecord.objects.select_related(
+        'operation', 'form').all()
     serializer_class = OperationRecordListSerializer
     filterset_class = OperationRecordFilterSet
     ordering_fields = ['id']
@@ -798,6 +786,7 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin
         elif self.action == 'retrieve':
             return OperationRecordDetailSerializer
         return super().get_serializer_class()
+
     @transaction.atomic()
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
@@ -806,7 +795,6 @@ class OperationRecordViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin
         instance.delete()
         return Response()
 
-
     def update(self, request, *args, **kwargs):
         serializer = OperationRecordSubmitSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
@@ -828,8 +816,9 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
     """
     消耗物料
     """
-    perms_map={'*':'*'}
-    queryset = OperationMaterial.objects.select_related('operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN)
+    perms_map = {'*': '*'}
+    queryset = OperationMaterial.objects.select_related(
+        'operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_IN)
     serializer_class = OperationMaterialListSerializer
     filterset_fields = ['operation', 'subproduction_plan']
     ordering_fields = ['id']
@@ -839,8 +828,9 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
         if self.action == 'create':
             return OperationMaterialCreate1Serailizer
         return super().get_serializer_class()
-    
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=OperationMaterialCreate1ListSerailizer)
+
+    @action(methods=['post'], detail=False, perms_map={'post': '*'},
+            serializer_class=OperationMaterialCreate1ListSerailizer)
     def creates(self, request, pk=None):
         """
         批量创建消耗物料
@@ -850,7 +840,6 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
         serializer.save()
         return Response()
 
-
     @transaction.atomic()
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
@@ -859,13 +848,16 @@ class OperationMaterialInputViewSet(ListModelMixin, CreateModelMixin, DestroyMod
         instance.delete()
         return Response()
 
+
 class CuttingListViewSet(ListModelMixin, GenericViewSet):
     """
     下料清单
     """
-    perms_map={'*':'*'}
-    queryset = OperationMaterial.objects.select_related('operation', 
-            'subproduction_plan', 'material', 'operation__create_by').filter(operation__step__id=1, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
+    perms_map = {'*': '*'}
+    queryset = OperationMaterial.objects.select_related('operation',
+                                                        'subproduction_plan', 'material',
+                                                        'operation__create_by').filter(operation__step__id=1,
+                                                                                       type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
     serializer_class = CuttingListSerializer
     filterset_class = CuttingFilterSet
     ordering_fields = ['id']
@@ -876,8 +868,9 @@ class OperationMaterialOutputViewSet(ListModelMixin, CreateModelMixin, DestroyMo
     """
     产出物料
     """
-    perms_map={'*':'*'}
-    queryset = OperationMaterial.objects.select_related('operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
+    perms_map = {'*': '*'}
+    queryset = OperationMaterial.objects.select_related(
+        'operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
     serializer_class = OperationMaterialListSerializer
     filterset_fields = ['operation', 'subproduction_plan']
     ordering_fields = ['id']
@@ -887,8 +880,9 @@ class OperationMaterialOutputViewSet(ListModelMixin, CreateModelMixin, DestroyMo
         if self.action == 'create':
             return OperationMaterialCreate2Serailizer
         return super().get_serializer_class()
-    
-    @action(methods=['post'], detail=False, perms_map={'post':'*'}, serializer_class=OperationMaterialCreate2ListSerailizer)
+
+    @action(methods=['post'], detail=False, perms_map={'post': '*'},
+            serializer_class=OperationMaterialCreate2ListSerailizer)
     def creates(self, request, pk=None):
         """
         批量创建产出物料
@@ -906,12 +900,14 @@ class OperationMaterialOutputViewSet(ListModelMixin, CreateModelMixin, DestroyMo
         instance.delete()
         return Response()
 
+
 class OperationMaterialToolViewSet(ListModelMixin, CreateModelMixin, DestroyModelMixin, GenericViewSet):
     """
     工具工装
     """
-    perms_map={'*':'*'}
-    queryset = OperationMaterial.objects.select_related('operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL)
+    perms_map = {'*': '*'}
+    queryset = OperationMaterial.objects.select_related(
+        'operation', 'subproduction_plan').filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL)
     serializer_class = OperationMaterialListSerializer
     filterset_fields = ['operation', 'subproduction_plan']
     ordering_fields = ['id']
@@ -921,7 +917,7 @@ class OperationMaterialToolViewSet(ListModelMixin, CreateModelMixin, DestroyMode
         if self.action == 'create':
             return OperationMaterialCreate3Serializer
         return super().get_serializer_class()
-        
+
     @transaction.atomic()
     def destroy(self, request, *args, **kwargs):
         instance = self.get_object()
@@ -930,9 +926,11 @@ class OperationMaterialToolViewSet(ListModelMixin, CreateModelMixin, DestroyMode
         instance.delete()
         return Response()
 
+
 class DoFormInit(CreateAPIView, GenericAPIView):
-    perms_map={'*':'*'}
-    serializer_class=OperationInitSerializer
+    perms_map = {'*': '*'}
+    serializer_class = OperationInitSerializer
+
     def post(self, request, format=None):
         """
         调用操作表单
@@ -944,24 +942,28 @@ class DoFormInit(CreateAPIView, GenericAPIView):
         ret = {}
         ret_0 = {}
         ret_0['step'] = data['step']
-        splans =[]
+        splans = []
         ret_0['input'] = []
         # ret_0['subproduction_plan'] = data['subproduction_plan']
         if 'wproducts' in data and data['wproducts']:
             ret_0['wproducts'] = data['wproducts']
-            splans = WProduct.objects.filter(id__in=data['wproducts']).values_list('subproduction_plan', flat=True)
+            splans = WProduct.objects.filter(id__in=data['wproducts']).values_list(
+                'subproduction_plan', flat=True)
             # 调出所属子计划现有物料
-            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(subproduction_plan__in=splans), many=True).data
+            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(
+                subproduction_plan__in=splans), many=True).data
         else:
             if 'subproduction_plan' in vdata:
                 splans = [vdata['subproduction_plan']]
             else:
-                splans = SubProductionPlan.objects.filter(is_deleted=False, 
-                subproduction__usedstep_subproduction__step=vdata['step'], state=3)
+                splans = SubProductionPlan.objects.filter(is_deleted=False,
+                                                          subproduction__usedstep_subproduction__step=vdata[
+                                                              'step'],
+                                                          state=3)
             ret_0['wproducts'] = []
-            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(subproduction_plan__in=splans), many=True).data
+            ret_0['input'] = WMaterialListSerializer(instance=WMaterial.objects.filter(
+                subproduction_plan__in=splans), many=True).data
 
-        
         for i in ret_0['input']:
             i['count_input'] = 0
         # 需要输出的物料
@@ -969,35 +971,39 @@ class DoFormInit(CreateAPIView, GenericAPIView):
             # 排除主要产物, 因为已经放到半成品里了, 由半成品进行处理, 夹层可能需要特殊处理
             o_objs = SubProductionProgress.objects.filter(
                 subproduction_plan__in=splans, type=SubprodctionMaterial.SUB_MA_TYPE_OUT).exclude(is_main=True)
-            
+
         else:
             # 此时显示所有子计划需要输出的物料
             o_objs = SubProductionProgress.objects.filter(
                 subproduction_plan__in=splans, type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
-        ret_0['output'] = list(o_objs.values('subproduction_plan', 'material', 'material__name', 'material__number'))
+        ret_0['output'] = list(o_objs.values(
+            'subproduction_plan', 'material', 'material__name', 'material__number'))
         for i in ret_0['output']:
-            i['count_output']=0
+            i['count_output'] = 0
         ret['forms'] = []
         ret_0['id'] = 0
         ret_0['name'] = '基本信息'
         # 查询工具工装
-        ret_0['tools'] = SubprodctionMaterialListSerializer(instance=
-                        SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL,
-                        subproduction__subplan_subprod__in = splans), many=True).data
+        ret_0['tools'] = SubprodctionMaterialListSerializer(
+            instance=SubprodctionMaterial.objects.filter(type=SubprodctionMaterial.SUB_MA_TYPE_TOOL,
+                                                         subproduction__subplan_subprod__in=splans), many=True).data
         # 查询技术文档
-        ret_0['techdocs'] = TechDocListSerializer(instance = 
-                TechDoc.objects.filter(subproduction__subplan_subprod__in = splans, enabled=True)\
+        ret_0['techdocs'] = TechDocListSerializer(
+            instance=TechDoc.objects.filter(
+                subproduction__subplan_subprod__in=splans, enabled=True)
             .distinct(), many=True).data
 
         ret['forms'].append(ret_0)
-        forms = RecordForm.objects.filter(step=vdata['step'], type=RecordForm.RF_TYPE_DO)
+        forms = RecordForm.objects.filter(
+            step=vdata['step'], type=RecordForm.RF_TYPE_DO)
         if forms.exists():
-            ret['forms'].extend(RecordFormDetailSerializer(instance=forms, many=True).data) 
+            ret['forms'].extend(RecordFormDetailSerializer(
+                instance=forms, many=True).data)
         return Response(ret)
 
 
 class DoFormSubmit(CreateAPIView, GenericAPIView):
-    perms_map={'*':'*'}
+    perms_map = {'*': '*'}
     serializer_class = OperationSubmitSerializer
 
     @transaction.atomic
@@ -1006,18 +1012,19 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
         提交操作表单
         """
         data = request.data
-        serializer = OperationSubmitSerializer(data=data, context={'request':self.request})
+        serializer = OperationSubmitSerializer(
+            data=data, context={'request': self.request})
         serializer.is_valid(raise_exception=True)
-        vdata = serializer.validated_data #校验之后的数据
+        vdata = serializer.validated_data  # 校验之后的数据
 
         # 创建一个生产操作记录
         action_obj = Operation()
         action_obj.step = vdata['step']
-        action_obj.remark = vdata.get('remark', '') # 操作备注
+        action_obj.remark = vdata.get('remark', '')  # 操作备注
         action_obj.create_by = request.user
         action_obj.use_scrap = vdata.get('use_scrap', False)
         action_obj.save()
-        
+
         # 保存关联半成品
         if 'wproducts' in data and data['wproducts']:
             owps = []
@@ -1034,45 +1041,46 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
 
         # 保存物料消耗
         for i in vdata['input']:
-            if i['count_input']: #如果有消耗
+            if i['count_input']:  # 如果有消耗
                 i_wmat = i['id']
                 OperationMaterial.objects.create(type=1, operation=action_obj,
-                    wmaterial= i_wmat, count=i['count_input'])
+                                                 wmaterial=i_wmat, count=i['count_input'])
                 # 更新车间物料
-                i_wmat.count = i_wmat.count- i['count_input']
+                i_wmat.count = i_wmat.count - i['count_input']
                 i_wmat.save()
                 # 更新子计划物料消耗情况
                 sp = SubProductionProgress.objects.get(subproduction_plan=i_wmat.subproduction_plan,
-                    material=i_wmat.material)
+                                                       material=i_wmat.material)
                 sp.count_real = sp.count_real + i['count_input']
                 sp.save()
-        
+
         # 物料产出
         if 'output' in data and data['output']:
-            for i in vdata['output']: # 已经序列化好的数据
+            for i in vdata['output']:  # 已经序列化好的数据
                 ma = i['material']
-                if i['subproduction_plan'].product == ma: # 如果是该计划主产物
+                if i['subproduction_plan'].product == ma:  # 如果是该计划主产物
                     # 如果是切割
                     # 获取下一步子工序
                     if vdata['step'].type == Step.STEP_TYPE_DIV:
-                        newstep, _ = WpmServies.get_next_step(i['subproduction_plan'], vdata['step'])
+                        newstep, _ = WpmServies.get_next_step(
+                            i['subproduction_plan'], vdata['step'])
                         wpr = dict(material=ma, step=newstep,
-                            act_state=WProduct.WPR_ACT_STATE_DOWAIT, remark='', 
-                            subproduction_plan=i['subproduction_plan'])
+                                   act_state=WProduct.WPR_ACT_STATE_DOWAIT, remark='',
+                                   subproduction_plan=i['subproduction_plan'])
                         for x in range(i['count_output']):
                             WProduct.objects.create(**wpr)
                 else:
                     # 更新操作产出物料表
                     OperationMaterial.objects.create(type=2, operation=action_obj,
-                    material= ma, count=i['count_output'])
+                                                     material=ma, count=i['count_output'])
                     # 更新车间物料表
                     ins, _ = WMaterial.objects.get_or_create(subproduction_plan=i['subproduction_plan'],
-                        material=ma)
+                                                             material=ma)
                     ins.count = ins.count + i['count_output']
                     ins.save()
                     # 更新子计划进度表
                     sp = SubProductionProgress.objects.get(subproduction_plan=i['subproduction_plan'],
-                    material=ma)
+                                                           material=ma)
                     sp.count_real = sp.count_real + i['count_input']
                     sp.save()
 
@@ -1081,31 +1089,33 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
             if vdata['step'].type == Step.STEP_TYPE_COMB:
                 wproducts = vdata['wproducts']
                 if 'suproduction_plan' in vdata:
-                    wproducts.update(is_hidden=True) # 隐藏
-                    newstep, hasNext = WpmServies.get_next_step(i['subproduction_plan'], vdata['step'])
+                    wproducts.update(is_hidden=True)  # 隐藏
+                    newstep, hasNext = WpmServies.get_next_step(
+                        i['subproduction_plan'], vdata['step'])
                     wproduct = WProduct()
                     wproduct.material = vdata['subproduction_plan'].product
                     wproduct.step = newstep
-                    wproduct.subproduction_plan=vdata['subproduction_plan']
+                    wproduct.subproduction_plan = vdata['subproduction_plan']
                     wproduct.parent = data['wproducts']
                     if hasNext:
-                        wproduct.act_state=WProduct.WPR_ACT_STATE_DOWAIT
+                        wproduct.act_state = WProduct.WPR_ACT_STATE_DOWAIT
                     else:
-                        wproduct.act_state=WProduct.WPR_ACT_STATE_TOTEST
+                        wproduct.act_state = WProduct.WPR_ACT_STATE_TOTEST
                     wproduct.save()
                 else:
                     raise exceptions.APIException('请指定子计划')
             else:
                 for wproduct in vdata['wproducts']:
                     # 获取下一步子工序
-                    newstep, hasNext = WpmServies.get_next_step(wproduct.subproduction_plan, vdata['step'])
+                    newstep, hasNext = WpmServies.get_next_step(
+                        wproduct.subproduction_plan, vdata['step'])
                     wproduct.step = newstep
-                    wproduct.pre_step=vdata['step']
+                    wproduct.pre_step = vdata['step']
                     if hasNext:
-                        wproduct.act_state=WProduct.WPR_ACT_STATE_DOWAIT
+                        wproduct.act_state = WProduct.WPR_ACT_STATE_DOWAIT
                     else:
-                        wproduct.act_state=WProduct.WPR_ACT_STATE_TOTEST
-                        wproduct.material=wproduct.subproduction_plan.product
+                        wproduct.act_state = WProduct.WPR_ACT_STATE_TOTEST
+                        wproduct.material = wproduct.subproduction_plan.product
                     wproduct.save()
 
         # 保存自定义表单结果
@@ -1116,7 +1126,7 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
             wr.operation = action_obj
             wr.save()
             wrds = []
-            for m in i['record_data']: # 保存记录详情
+            for m in i['record_data']:  # 保存记录详情
                 form_field = m['form_field']
                 m['field_name'] = form_field.field_name
                 m['field_key'] = form_field.field_key
@@ -1127,5 +1137,3 @@ class DoFormSubmit(CreateAPIView, GenericAPIView):
                 wrds.append(OperationRecordItem(**m))
             OperationRecordItem.objects.bulk_create(wrds)
         return Response()
-
-        
\ No newline at end of file

From 09a3581dcabf981141c19cc30697efe2a6bb3d27 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 15:15:40 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=85=A5=E5=BA=93remar?=
 =?UTF-8?q?k=E9=9D=9E=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/wpm/serializers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py
index d9f09dd..5889aa4 100644
--- a/hb_server/apps/wpm/serializers.py
+++ b/hb_server/apps/wpm/serializers.py
@@ -418,12 +418,12 @@ class WplanPutInSerializer(serializers.Serializer):
 
 class WproductPutInSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
-    remark = serializers.CharField(label="入库备注", required =False, default="")
+    remark = serializers.CharField(label="入库备注", required=False, allow_blank=True)
 
 class WproductPutInsSerializer(serializers.Serializer):
     warehouse = serializers.PrimaryKeyRelatedField(queryset=WareHouse.objects.all(), label="仓库ID")
     wproducts = serializers.PrimaryKeyRelatedField(queryset=WProduct.objects.all(), label='半成品ID', many=True)
-    remark = serializers.CharField(label="入库备注", required =False, default="")
+    remark = serializers.CharField(label="入库备注", required=False, allow_blank=True)
 
 
 class OperationEquipListSerializer(serializers.Serializer):

From 783a778d710b2ed9122c03f242e7ecaf7c4a7249 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 15:19:22 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=B6=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/em/serializers.py | 2 +-
 hb_server/apps/inm/models.py     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hb_server/apps/em/serializers.py b/hb_server/apps/em/serializers.py
index 677383b..be34bfc 100644
--- a/hb_server/apps/em/serializers.py
+++ b/hb_server/apps/em/serializers.py
@@ -27,7 +27,7 @@ class EquipmentSerializer(ModelSerializer):
 class EquipmentSimpleSerializer(ModelSerializer):
     class Meta:
         model = Equipment
-        fields = ['id', 'number', 'name']
+        fields = ['id', 'number', 'name', 'state']
 
 
 
diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index 0fe74a4..21105c0 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -84,7 +84,6 @@ class FIFOItem(BaseModel):
     """
     出入库详细条目
     """
-    need_test = models.BooleanField('是否需要检验', default=False)
     is_tested = models.BooleanField('是否已检验', default=False)
     is_testok = models.BooleanField('是否检验合格', default=False)
     warehouse = models.ForeignKey(

From 62bd7423db07f90c7bfc8ad1f3650a43ccbab0a4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 15:28:04 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=A1=AB=E5=86=99=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/inm/serializers.py | 54 ++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/hb_server/apps/inm/serializers.py b/hb_server/apps/inm/serializers.py
index a05e3c1..32abb80 100644
--- a/hb_server/apps/inm/serializers.py
+++ b/hb_server/apps/inm/serializers.py
@@ -1,78 +1,95 @@
 from rest_framework import serializers
 
-from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, MaterialBatch, WareHouse,Inventory
+from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, MaterialBatch, WareHouse, Inventory
 from apps.qm.models import TestRecord, TestRecordItem
 
 from apps.system.serializers import UserSimpleSerializer
 from apps.mtm.serializers import MaterialSimpleSerializer
 from django.db import transaction
 
-class WareHouseSerializer(serializers. ModelSerializer):
-    create_by_=UserSimpleSerializer('create_by', read_only=True)
+
+class WareHouseSerializer(serializers.ModelSerializer):
+    create_by_ = UserSimpleSerializer('create_by', read_only=True)
+
     class Meta:
         model = WareHouse
         fields = '__all__'
 
+
 class WareHouseCreateUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = WareHouse
         fields = ['name', 'number', 'place']
 
+
 class WareHouseSimpleSerializer(serializers.ModelSerializer):
     class Meta:
         model = WareHouse
         fields = ['name', 'number', 'place']
 
-class InventorySerializer(serializers. ModelSerializer):
-    material_= MaterialSimpleSerializer(source='material', read_only=True)
+
+class InventorySerializer(serializers.ModelSerializer):
+    material_ = MaterialSimpleSerializer(source='material', read_only=True)
     warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True)
+
     class Meta:
         model = Inventory
         fields = '__all__'
 
-class MaterialBatchSerializer(serializers. ModelSerializer):
-    material_= MaterialSimpleSerializer(source='material', read_only=True)
+
+class MaterialBatchSerializer(serializers.ModelSerializer):
+    material_ = MaterialSimpleSerializer(source='material', read_only=True)
     warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True)
+
     class Meta:
         model = MaterialBatch
         fields = '__all__'
 
+
 class IProductListSerializer(serializers.ModelSerializer):
-    material_= MaterialSimpleSerializer(source='material', read_only=True)
+    material_ = MaterialSimpleSerializer(source='material', read_only=True)
     warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True)
     is_mtested = serializers.BooleanField(source='wproduct.is_mtested', read_only=True)
     is_mtestok = serializers.BooleanField(source='wproduct.is_mtestok', read_only=True)
     remark_mtest = serializers.CharField(source='wproduct.remark_mtest', read_only=True)
+
     class Meta:
         model = IProduct
         fields = '__all__'
-    
+
 
 class FIFOListSerializer(serializers.ModelSerializer):
     auditor_ = UserSimpleSerializer(source='auditor', read_only=True)
     create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
+
     class Meta:
-        model=FIFO
+        model = FIFO
         fields = '__all__'
 
+
 class FIFOItemSerializer(serializers.ModelSerializer):
     warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True)
-    material_= MaterialSimpleSerializer(source='material', read_only=True)
+    material_ = MaterialSimpleSerializer(source='material', read_only=True)
+
     class Meta:
-        model= FIFOItem
+        model = FIFOItem
         fields = '__all__'
 
+
 class IProductInPurSerializer(serializers.ModelSerializer):
     class Meta:
         model = IProduct
         fields = ['number']
-    
+
+
 class FIFODetailInPurSerializer(serializers.ModelSerializer):
     details = IProductInPurSerializer(many=True, required=False)
+
     class Meta:
         model = FIFOItem
         fields = ['material', 'count', 'batch', 'details', 'warehouse']
 
+
 class MaterialBatchQuerySerializer(serializers.Serializer):
     warehouse = serializers.IntegerField(label="仓库ID", required=False)
     materials = serializers.ListField(child=serializers.IntegerField(label="物料ID"), required=False)
@@ -83,13 +100,14 @@ class FIFOInPurSerializer(serializers.ModelSerializer):
     采购入库序列化
     """
     details = FIFODetailInPurSerializer(many=True)
+
     class Meta:
         model = FIFO
-        fields = ['details', 'inout_date']
+        fields = ['details']
 
     def create(self, validated_data):
         details = validated_data.pop('details')
-        if len(details)>0:
+        if len(details) > 0:
             pass
         else:
             raise serializers.ValidationError('没有入库内容')
@@ -103,7 +121,7 @@ class FIFOInPurSerializer(serializers.ModelSerializer):
         #                 raise serializers.ValidationError('批次号{}在其他仓库已存在'.format(i['batch']))
         #     except:
         #         pass
-        
+
         # 创建采购入库
         with transaction.atomic():
             validated_data['type'] = FIFO.FIFO_TYPE_PUR_IN
@@ -137,17 +155,17 @@ class FIFOInPurSerializer(serializers.ModelSerializer):
         return obj
 
 
-
 class InmTestRecordItemCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = TestRecordItem
         fields = ['form_field', 'field_value', 'is_testok']
 
+
 class InmTestRecordCreateSerializer(serializers.ModelSerializer):
     record_data = InmTestRecordItemCreateSerializer(many=True)
     fifo_item = serializers.PrimaryKeyRelatedField(queryset=FIFOItem.objects.all(), required=True)
     is_testok = serializers.BooleanField()
+
     class Meta:
         model = TestRecord
         fields = ['form', 'record_data', 'is_testok', 'fifo_item']
-

From 490440cad3d49b409f4e53f89c3c8df728996955 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 15:32:41 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0026_alter_fifo_inout_date.py   | 18 ++++++++++++++++++
 hb_server/apps/inm/models.py                   |  2 +-
 hb_server/apps/inm/views.py                    |  7 +++++--
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py

diff --git a/hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py b/hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py
new file mode 100644
index 0000000..f086ed3
--- /dev/null
+++ b/hb_server/apps/inm/migrations/0026_alter_fifo_inout_date.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.9 on 2022-01-14 07:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inm', '0025_auto_20220113_0932'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fifo',
+            name='inout_date',
+            field=models.DateField(blank=True, null=True, verbose_name='出入库日期'),
+        ),
+    ]
diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index 21105c0..6d179f6 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -76,7 +76,7 @@ class FIFO(CommonADModel):
     is_audited = models.BooleanField('是否审核', default=False)
     auditor = models.ForeignKey(
         User, verbose_name='审核人', on_delete=models.CASCADE, null=True, blank=True)
-    inout_date = models.DateField('出入库日期')
+    inout_date = models.DateField('出入库日期', null=True, blank=True)
     remark = models.CharField('备注', max_length=1000, default='')
 
 
diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py
index 2b3af52..0aa9d0f 100644
--- a/hb_server/apps/inm/views.py
+++ b/hb_server/apps/inm/views.py
@@ -7,7 +7,9 @@ from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from apps.inm.filters import IProductFilterSet, MbFilterSet
 
 from apps.inm.models import FIFO, FIFOItem, IProduct, MaterialBatch, WareHouse, Inventory
-from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, WareHouseCreateUpdateSerializer, InventorySerializer
+from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, \
+    InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, \
+    WareHouseCreateUpdateSerializer, InventorySerializer
 from apps.inm.signals import update_inm
 from apps.mtm.models import Material
 from apps.pm.services import PmService
@@ -20,6 +22,7 @@ from django.utils import timezone
 
 from apps.wpm.services import WpmServies
 
+
 # Create your views here.
 
 
@@ -173,7 +176,7 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         with transaction.atomic():
             obj.is_audited = True
             obj.auditor = request.user
-            obj.inout_date = timezone.now() # 也是审核日期
+            obj.inout_date = timezone.now()  # 也是审核日期
             obj.save()
             update_inm(obj)  # 更新库存
         return Response()

From 75ff28535a8ebe5d4956ca6d1832a0f0a9948c50 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 15:51:35 +0800
Subject: [PATCH 14/15] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0need=5Ftest=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/inm/filters.py                 | 11 ++++---
 .../inm/migrations/0027_auto_20220114_1551.py | 33 +++++++++++++++++++
 hb_server/apps/inm/models.py                  |  5 +--
 hb_server/apps/inm/views.py                   | 11 ++-----
 hb_server/apps/sam/views.py                   |  3 +-
 hb_server/apps/wpm/serializers.py             |  1 -
 hb_server/apps/wpm/views.py                   |  4 ---
 7 files changed, 47 insertions(+), 21 deletions(-)
 create mode 100644 hb_server/apps/inm/migrations/0027_auto_20220114_1551.py

diff --git a/hb_server/apps/inm/filters.py b/hb_server/apps/inm/filters.py
index c6beb53..db876ec 100644
--- a/hb_server/apps/inm/filters.py
+++ b/hb_server/apps/inm/filters.py
@@ -3,22 +3,25 @@ from django_filters import rest_framework as filters
 from apps.mtm.models import Material
 from .models import IProduct, MaterialBatch
 from django.utils import timezone
+
+
 class MbFilterSet(filters.FilterSet):
     material = filters.ModelMultipleChoiceFilter(field_name="material", queryset=Material.objects.all())
     tag = filters.CharFilter(method="filter_tag")
+
     class Meta:
         model = MaterialBatch
         fields = ['material', 'warehouse']
-    
+
     def filter_tag(self, queryset, name, value):
         if value == 'expired':
-            queryset = queryset.exclude(expiration_date=None).filter(expiration_date__lte = timezone.now())
+            queryset = queryset.exclude(expiration_date=None).filter(expiration_date__lte=timezone.now())
         return queryset
 
 
 class IProductFilterSet(filters.FilterSet):
-
     order = filters.NumberFilter(field_name="wproduct__subproduction_plan__production_plan__order")
+
     class Meta:
         model = IProduct
-        fields = ['material', 'warehouse', 'batch', 'order', 'material__type']
\ No newline at end of file
+        fields = ['material', 'warehouse', 'batch', 'order', 'material__type']
diff --git a/hb_server/apps/inm/migrations/0027_auto_20220114_1551.py b/hb_server/apps/inm/migrations/0027_auto_20220114_1551.py
new file mode 100644
index 0000000..5f0ea85
--- /dev/null
+++ b/hb_server/apps/inm/migrations/0027_auto_20220114_1551.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.9 on 2022-01-14 07:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0003_auto_20210812_0909'),
+        ('inm', '0026_alter_fifo_inout_date'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='fifoitem',
+            name='is_tested',
+        ),
+        migrations.AddField(
+            model_name='fifoitem',
+            name='files',
+            field=models.ManyToManyField(to='system.File', verbose_name='上传材料'),
+        ),
+        migrations.AddField(
+            model_name='fifoitem',
+            name='need_test',
+            field=models.BooleanField(default=False, verbose_name='是否需要复验'),
+        ),
+        migrations.AlterField(
+            model_name='fifoitem',
+            name='is_testok',
+            field=models.BooleanField(blank=True, null=True, verbose_name='是否复验合格'),
+        ),
+    ]
diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index 6d179f6..af1b84a 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -84,8 +84,8 @@ class FIFOItem(BaseModel):
     """
     出入库详细条目
     """
-    is_tested = models.BooleanField('是否已检验', default=False)
-    is_testok = models.BooleanField('是否检验合格', default=False)
+    need_test = models.BooleanField('是否需要复验', default=False)
+    is_testok = models.BooleanField('是否复验合格', null=True, blank=True)
     warehouse = models.ForeignKey(
         WareHouse, on_delete=models.CASCADE, verbose_name='仓库')
     material = models.ForeignKey(
@@ -96,6 +96,7 @@ class FIFOItem(BaseModel):
                              on_delete=models.CASCADE)
     subproduction_plan = models.ForeignKey(
         SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE, null=True, blank=True)
+    files = models.ManyToManyField(File, verbose_name='上传材料')
 
 
 class IProduct(BaseModel):
diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py
index 0aa9d0f..d36b6ec 100644
--- a/hb_server/apps/inm/views.py
+++ b/hb_server/apps/inm/views.py
@@ -1,8 +1,7 @@
-from django.shortcuts import render
 from rest_framework import serializers
 from rest_framework import exceptions
 from rest_framework.exceptions import APIException
-from rest_framework.mixins import DestroyModelMixin, ListModelMixin, RetrieveModelMixin
+from rest_framework.mixins import DestroyModelMixin, ListModelMixin
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from apps.inm.filters import IProductFilterSet, MbFilterSet
 
@@ -11,17 +10,13 @@ from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOLi
     InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, \
     WareHouseCreateUpdateSerializer, InventorySerializer
 from apps.inm.signals import update_inm
-from apps.mtm.models import Material
-from apps.pm.services import PmService
 from apps.qm.models import TestRecordItem
-from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
+from apps.system.mixins import CreateUpdateModelAMixin
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from django.db import transaction
 from django.utils import timezone
 
-from apps.wpm.services import WpmServies
-
 
 # Create your views here.
 
@@ -168,7 +163,7 @@ class FIFOViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
         审核通过
         """
         obj = self.get_object()
-        for i in FIFOItem.objects.filter(fifo=obj):
+        for i in FIFOItem.objects.filter(fifo=obj, need_test=True):
             if not i.is_testok:
                 raise APIException('未检验通过, 不可审核')
         if obj.is_audited:
diff --git a/hb_server/apps/sam/views.py b/hb_server/apps/sam/views.py
index 62fd081..a239d8e 100644
--- a/hb_server/apps/sam/views.py
+++ b/hb_server/apps/sam/views.py
@@ -150,8 +150,7 @@ class SaleViewSet(CreateUpdateCustomMixin, ListModelMixin, RetrieveModelMixin, C
             warehouse = WareHouse.objects.get(id=i['warehouse'])
             material = Material.objects.get(id=i['material'])
             fifoitem = FIFOItem()
-            fifoitem.is_tested = True
-            fifoitem.is_testok = True
+            fifoitem.need_test = False
             fifoitem.warehouse = warehouse
             fifoitem.material = material
             fifoitem.count = i['total']
diff --git a/hb_server/apps/wpm/serializers.py b/hb_server/apps/wpm/serializers.py
index 5889aa4..8956eb3 100644
--- a/hb_server/apps/wpm/serializers.py
+++ b/hb_server/apps/wpm/serializers.py
@@ -69,7 +69,6 @@ class PickSerializer(serializers.Serializer):
                     if isLowLevel:
                         iproducts = i.pop('iproducts')
                     i['fifo'] = fifo
-                    i['is_testok'] = True # 默认检验合格
                     i['subproduction_plan'] = sp
                     fifoitem = FIFOItem.objects.create(**i)
                     # 创建再下一个层级
diff --git a/hb_server/apps/wpm/views.py b/hb_server/apps/wpm/views.py
index 0920983..28d8a12 100644
--- a/hb_server/apps/wpm/views.py
+++ b/hb_server/apps/wpm/views.py
@@ -248,8 +248,6 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
         for i in wproducts_a:
             spi = SubProductionPlan.objects.get(pk=i['subproduction_plan'])
             fifoitem = FIFOItem()
-            fifoitem.is_tested = True
-            fifoitem.is_testok = True
             fifoitem.warehouse = warehouse
             fifoitem.material = Material.objects.get(pk=i['material'])
             fifoitem.count = i['total']
@@ -303,8 +301,6 @@ class WProductViewSet(ListModelMixin, RetrieveModelMixin, GenericViewSet):
                                    create_by=request.user, remark=remark)
         # 创建入库明细
         fifoitem = FIFOItem()
-        fifoitem.is_tested = True
-        fifoitem.is_testok = True
         fifoitem.warehouse = warehouse
         fifoitem.material = material
         fifoitem.count = 1  # 单个半成品入库

From 4257741c2d8f71be4477ac56ebd600d217ffa034 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 14 Jan 2022 16:34:20 +0800
Subject: [PATCH 15/15] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=B0=E5=BD=95need?=
 =?UTF-8?q?=5Ftest=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_server/apps/develop/urls.py                |  6 ++++--
 hb_server/apps/develop/views.py               | 20 ++++++++++++++++++-
 .../migrations/0028_alter_fifoitem_files.py   | 19 ++++++++++++++++++
 hb_server/apps/inm/models.py                  |  2 +-
 hb_server/apps/inm/serializers.py             | 17 ++++++++++++++++
 hb_server/apps/inm/views.py                   | 14 ++++++++-----
 6 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 hb_server/apps/inm/migrations/0028_alter_fifoitem_files.py

diff --git a/hb_server/apps/develop/urls.py b/hb_server/apps/develop/urls.py
index 8f6e395..b284243 100644
--- a/hb_server/apps/develop/urls.py
+++ b/hb_server/apps/develop/urls.py
@@ -2,11 +2,13 @@ from django.db.models import base
 from rest_framework import urlpatterns
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
-from apps.develop.views import CleanDataView, UpdateCuttingView, UpdateLastTestResult
+from apps.develop.views import CleanDataView, UpdateCuttingView, UpdateFIFOItem, UpdateLastTestResult
 
 urlpatterns = [
     path('cleandata/', CleanDataView.as_view()),
     path('update_cutting/', UpdateCuttingView.as_view()),
-    path('update_last_result/', UpdateLastTestResult.as_view())
+    path('update_last_result/', UpdateLastTestResult.as_view()),
+    path('update_last_result/', UpdateLastTestResult.as_view()),
+    path('update_fifoitem/', UpdateFIFOItem.as_view())
 ]
 
diff --git a/hb_server/apps/develop/views.py b/hb_server/apps/develop/views.py
index 7ca4ca8..f02f55f 100644
--- a/hb_server/apps/develop/views.py
+++ b/hb_server/apps/develop/views.py
@@ -4,7 +4,7 @@ from rest_framework.decorators import permission_classes
 from rest_framework.views import APIView
 from rest_framework.permissions import IsAdminUser
 from rest_framework.response import Response
-from apps.inm.models import FIFO, Inventory, MaterialBatch
+from apps.inm.models import FIFO, FIFOItem, Inventory, MaterialBatch
 from apps.mtm.models import Material
 from apps.pm.models import ProductionPlan
 from apps.sam.models import Order
@@ -62,3 +62,21 @@ class UpdateLastTestResult(APIView):
                 i.last_test_result = tr.is_testok
                 i.save()
         return Response()
+
+class UpdateFIFOItem(APIView):
+
+    permission_classes = [IsAdminUser]
+    @transaction.atomic
+    def post(self, request, format=None):
+        """
+        更新出入库结果
+        """
+        for i in FIFOItem.objects.all():
+            if i.fifo.type == FIFO.FIFO_TYPE_PUR_IN:
+                if i.is_testok:
+                    i.need_test = True
+                    i.save()
+            else:
+                i.is_testok = None
+                i.save()
+        return Response()
diff --git a/hb_server/apps/inm/migrations/0028_alter_fifoitem_files.py b/hb_server/apps/inm/migrations/0028_alter_fifoitem_files.py
new file mode 100644
index 0000000..df29017
--- /dev/null
+++ b/hb_server/apps/inm/migrations/0028_alter_fifoitem_files.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.9 on 2022-01-14 08:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('system', '0003_auto_20210812_0909'),
+        ('inm', '0027_auto_20220114_1551'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='fifoitem',
+            name='files',
+            field=models.ManyToManyField(blank=True, to='system.File', verbose_name='上传材料'),
+        ),
+    ]
diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py
index af1b84a..ee9d786 100644
--- a/hb_server/apps/inm/models.py
+++ b/hb_server/apps/inm/models.py
@@ -96,7 +96,7 @@ class FIFOItem(BaseModel):
                              on_delete=models.CASCADE)
     subproduction_plan = models.ForeignKey(
         SubProductionPlan, verbose_name='关联子生产计划', on_delete=models.CASCADE, null=True, blank=True)
-    files = models.ManyToManyField(File, verbose_name='上传材料')
+    files = models.ManyToManyField(File, verbose_name='上传材料', blank=True)
 
 
 class IProduct(BaseModel):
diff --git a/hb_server/apps/inm/serializers.py b/hb_server/apps/inm/serializers.py
index 32abb80..34d26f4 100644
--- a/hb_server/apps/inm/serializers.py
+++ b/hb_server/apps/inm/serializers.py
@@ -1,3 +1,4 @@
+from rest_framework import exceptions
 from rest_framework import serializers
 
 from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, MaterialBatch, WareHouse, Inventory
@@ -169,3 +170,19 @@ class InmTestRecordCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = TestRecord
         fields = ['form', 'record_data', 'is_testok', 'fifo_item']
+
+
+
+class FIFOItemUpdateSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = FIFOItem
+        fields = ['need_test', 'files']
+
+    def validate(self, attrs):
+        ins = self.instance
+        fifo = ins.fifo
+        if fifo.is_audited:
+            raise exceptions.APIException('该记录已审核')
+        if ins.is_testok is not None:
+            attrs.pop('need_test')
+        return super().validate(attrs)
\ No newline at end of file
diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py
index d36b6ec..932a1d1 100644
--- a/hb_server/apps/inm/views.py
+++ b/hb_server/apps/inm/views.py
@@ -1,12 +1,12 @@
 from rest_framework import serializers
 from rest_framework import exceptions
 from rest_framework.exceptions import APIException
-from rest_framework.mixins import DestroyModelMixin, ListModelMixin
+from rest_framework.mixins import DestroyModelMixin, ListModelMixin, UpdateModelMixin
 from rest_framework.viewsets import GenericViewSet, ModelViewSet
 from apps.inm.filters import IProductFilterSet, MbFilterSet
 
 from apps.inm.models import FIFO, FIFOItem, IProduct, MaterialBatch, WareHouse, Inventory
-from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOListSerializer, IProductListSerializer, \
+from apps.inm.serializers import FIFOItemSerializer, FIFOInPurSerializer, FIFOItemUpdateSerializer, FIFOListSerializer, IProductListSerializer, \
     InmTestRecordCreateSerializer, MaterialBatchQuerySerializer, MaterialBatchSerializer, WareHouseSerializer, \
     WareHouseCreateUpdateSerializer, InventorySerializer
 from apps.inm.signals import update_inm
@@ -77,7 +77,7 @@ class MaterialBatchViewSet(ListModelMixin, GenericViewSet):
         return Response(MaterialBatchSerializer(instance=queryset, many=True).data)
 
 
-class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
+class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, GenericViewSet):
     """
     出入库记录详情表
     """
@@ -85,11 +85,16 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
     queryset = FIFOItem.objects.select_related('material', 'fifo').all()
     serializer_class = FIFOItemSerializer
     filterset_fields = ['material', 'fifo',
-                        'fifo__type', 'is_tested', 'is_testok']
+                        'fifo__type', 'need_test', 'is_testok']
     search_fields = []
     ordering_fields = ['create_time']
     ordering = ['-create_time']
 
+    def get_serializer_class(self):
+        if self.action == 'update':
+            return FIFOItemUpdateSerializer
+        return super().get_serializer_class()
+
     def perform_destroy(self, instance):
         if instance.fifo.is_audited:
             raise APIException('该出入库记录已通过审核, 无法删除')
@@ -119,7 +124,6 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, GenericViewSet):
             # 如果检验合格
             if obj.fifo_item:
                 obj.fifo_item.is_testok = True if obj.is_testok else False
-                obj.fifo_item.is_tested = True
                 obj.fifo_item.save()
         return Response()