mirror/GreaterWMS
1
0
Fork 0
mirror of https://github.com/GreaterWMS/GreaterWMS.git synced 2026-06-19 07:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

V2.1.48

Browse Source
This commit is contained in:
Elvis.Shi
2023-11-28 20:35:41 +08:00
parent 15c51f6cf1
commit a77dfb4ebe
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/pages/ScanAPP.vue
+1 -1
View File
@@ -197,7 +197,7 @@ function datawedge64 () {
PARAM_LIST: {}
},
APP_LIST: [{
PACKAGE_NAME: 'org.greaterwms.app',
PACKAGE_NAME: 'org.greaterwms.scanner.app',
ACTIVITY_LIST: ['*']
}]
}
dn/views.py
+16 -2
View File
@@ -663,7 +663,7 @@ class DnOrderReleaseViewSet(viewsets.ModelViewSet):
dn_detail_list[i].goods_code)).first()
goods_bin_stock_list = stockbin.objects.filter(openid=self.request.auth.openid,
goods_code=str(dn_detail_list[i].goods_code),
bin_property="Normal").order_by('id')
bin_property="Normal", goods_qty__gt=0).order_by('id')
can_pick_qty = goods_qty_change.onhand_stock - \
goods_qty_change.inspect_stock - \
goods_qty_change.hold_stock - \
@@ -1111,7 +1111,7 @@ class DnOrderReleaseViewSet(viewsets.ModelViewSet):
dn_detail_list[i].goods_code)).first()
goods_bin_stock_list = stockbin.objects.filter(openid=self.request.auth.openid,
goods_code=str(dn_detail_list[i].goods_code),
bin_property="Normal").order_by('id')
bin_property="Normal", goods_qty__gt=0).order_by('id')
can_pick_qty = goods_qty_change.onhand_stock - \
goods_qty_change.inspect_stock - \
goods_qty_change.hold_stock - \
@@ -1610,6 +1610,13 @@ class DnPickedViewSet(viewsets.ModelViewSet):
return self.http_method_not_allowed(request=self.request)
def create(self, request, pk):
delete_data = stockbin.objects.filter(openid=self.request.auth.openid,
goods_qty=0,
pick_qty=0,
picked_qty=0)
if delete_data.exists():
for i in delete_data:
i.delete()
qs = self.get_object()
if qs.dn_status != 3:
raise APIException({"detail": "This dn Status Not Pre Pick"})
@@ -1699,6 +1706,13 @@ class DnPickedViewSet(viewsets.ModelViewSet):
return Response({"Detail": "success"}, status=200)
def update(self, request, *args, **kwargs):
delete_data = stockbin.objects.filter(openid=self.request.auth.openid,
goods_qty=0,
pick_qty=0,
picked_qty=0)
if delete_data.exists():
for i in delete_data:
i.delete()
data = self.request.data
qs = self.get_queryset().filter(dn_code=data['dn_code']).first()
if qs.dn_status != 3: