玻璃批量入库
This commit is contained in:
parent
52be92e98b
commit
03e0f0d1a2
|
|
@ -260,7 +260,7 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
|
||||||
warehouse = WareHouse.objects.get(id=vdata['warehouse'])
|
warehouse = WareHouse.objects.get(id=vdata['warehouse'])
|
||||||
for i in wproducts:
|
for i in wproducts:
|
||||||
if i.act_state is not WProduct.WPR_ACT_STATE_OK:
|
if i.act_state is not WProduct.WPR_ACT_STATE_OK:
|
||||||
raise exceptions.APIException('存在不可入库产品')
|
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'))
|
||||||
# 创建入库记录
|
# 创建入库记录
|
||||||
|
|
@ -269,15 +269,16 @@ class WProductViewSet(ListModelMixin, GenericViewSet):
|
||||||
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:
|
for i in wproducts_a:
|
||||||
|
spi = SubProductionPlan.objects.get(pk=i['subproduction_plan'])
|
||||||
fifoitem = FIFOItem()
|
fifoitem = FIFOItem()
|
||||||
fifoitem.is_tested = True
|
fifoitem.is_tested = True
|
||||||
fifoitem.is_testok = True
|
fifoitem.is_testok = True
|
||||||
fifoitem.warehouse = warehouse
|
fifoitem.warehouse = warehouse
|
||||||
fifoitem.material = i['material']
|
fifoitem.material = Material.objects.get(pk=i['material'])
|
||||||
fifoitem.count = i['total']
|
fifoitem.count = i['total']
|
||||||
fifoitem.batch = i['subproduction_plan__number']
|
fifoitem.batch = spi.number
|
||||||
fifoitem.fifo = fifo
|
fifoitem.fifo = fifo
|
||||||
fifoitem.subproduction_plan = i['subproduction_plan']
|
fifoitem.subproduction_plan = spi
|
||||||
fifoitem.save()
|
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'])
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue