zcdsj
/
hberp
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

消耗产出校验bug

This commit is contained in:
caoqianming 2022-01-13 16:06:22 +08:00
parent 95f444ce83
commit 8a162fbe58
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hb_server/apps/wpm/serializers.py
View File

@ -261,7 +261,8 @@ class OperationListSerializer(serializers.ModelSerializer):
if obj.step.type == Step.STEP_TYPE_NOM: if obj.step.type == Step.STEP_TYPE_NOM:
count_work = OperationWproduct.objects.filter(operation=obj).count() count_work = OperationWproduct.objects.filter(operation=obj).count()
else: else:
count_work = 0 count_work = OperationMaterial.objects.filter(operation=obj).annotate(count_work=Sum('count'))
print(count_work)
return count_work return count_work
def get_equip_(self, obj): def get_equip_(self, obj):

4
hb_server/apps/wpm/views.py
View File

@ -616,9 +616,7 @@ class OperationViewSet(ListModelMixin, RetrieveModelMixin, CreateModelMixin, Upd
omos = OperationMaterial.objects.filter(operation=op, omos = OperationMaterial.objects.filter(operation=op,
type=SubprodctionMaterial.SUB_MA_TYPE_OUT) type=SubprodctionMaterial.SUB_MA_TYPE_OUT)
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)) and op.step.type == Step.STEP_TYPE_DIV: if not (set(list(sps_omi_l)) == set(list(sps_omo_l)) and op.step.type == Step.STEP_TYPE_DIV):
pass
else:
raise exceptions.APIException('消耗与产出不一致') raise exceptions.APIException('消耗与产出不一致')
# 实际消耗物料校验 # 实际消耗物料校验