From 723b34a87f00c312fc3d8ee9e7229ead7e936e2d Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 29 Dec 2021 15:24:39 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0product=5F=20srm=20serial?=
 =?UTF-8?q?izer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hb_server/apps/srm/serializers.py b/hb_server/apps/srm/serializers.py
index 41543df..edea221 100644
--- a/hb_server/apps/srm/serializers.py
+++ b/hb_server/apps/srm/serializers.py
@@ -7,7 +7,7 @@ class SubplanGanttSerializer(serializers.ModelSerializer):
     product_ = MaterialSimpleSerializer(source='product', read_only=True)
     class Meta:
         model = SubProductionPlan
-        fields = ['id', 'number', 'start_date', 'end_date', 'count', 'count_real', 'count_ok', 'start_date_real', 'end_date_real', 'process_']
+        fields = ['id', 'number', 'start_date', 'end_date', 'count', 'count_real', 'count_ok', 'start_date_real', 'end_date_real', 'process_', 'product_']
 
 class PlanGanttSerializer(serializers.ModelSerializer):
     children = serializers.SerializerMethodField()

From 6e7246dd71d7dd9c0a16b5fdc361ffa34b59549f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 29 Dec 2021 15:25:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/hb_server/apps/pm/services.py b/hb_server/apps/pm/services.py
index c5e420b..b5eef7e 100644
--- a/hb_server/apps/pm/services.py
+++ b/hb_server/apps/pm/services.py
@@ -10,8 +10,8 @@ class PmService:
         """
         ret = {}
         subplans = SubProductionPlan.objects.filter(production_plan=plan, is_deleted=False)
-        qs = subplans.values('process', 'process__name', 'process__number').annotate(count=Sum('main_count'), 
-        count_real=Sum('main_count_real'), count_ok=Sum('main_count_ok'), count_notok=Sum('main_count_notok'))
+        qs = subplans.values('process', 'process__name', 'process__number').annotate(count=Sum('count'), 
+        count_real=Sum('count_real'), count_ok=Sum('count_ok'), count_notok=Sum('count_notok'))
         qs_list = list(qs)
         for i in qs_list:
             ret[i['process__number']] = {

From 17b7345e95f930f23e3699a9aa20f1b44ea9b7f8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 29 Dec 2021 15:26:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/views/sam/order.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index e0bb94c..c92f338 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -49,7 +49,7 @@
           <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
         </el-table-column>
           <el-table-column label="所属合同"  width="200" show-overflow-tooltip>
-          <template slot-scope="scope">{{ 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="产品名称"  width="200" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.product_.name }}</template>