From e956e8f0dad7c1f4e119325da0b4742119d2b248 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 20 May 2022 16:55:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E9=AA=8C=E6=94=B6=E5=BA=93=E5=AD=98?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/sale/admin/constant/ConstantStatus.java | 1 + .../sale/admin/controller/basic/SpsSyncUploadController.java | 3 +++ .../sale/admin/controller/inout/utils/CheckOrderUtils.java | 5 +++++ .../glxp/sale/admin/entity/basic/BussinessTypeEntity.java | 3 +++ .../com/glxp/sale/admin/res/basic/BussinessTypResponse.java | 2 ++ .../com/glxp/sale/admin/thread/InvProductsTrService.java | 5 +++++ .../java/com/glxp/sale/admin/thread/IoTransInoutService.java | 5 +++++ 7 files changed, 24 insertions(+) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java index 8a89038..3f75b78 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/ConstantStatus.java @@ -95,6 +95,7 @@ public class ConstantStatus { public static final int FROM_CHANGE = 6; //单据流转 public static final int FROM_UDISP = 7; //udi供应商平台 public static final int FROM_PEACE_CHANGE = 8; //平衡补单 + public static final int FROM_UDIWMS = 9; //DI类型 diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java index 5d3a4ad..d53f639 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncUploadController.java @@ -287,6 +287,9 @@ public class SpsSyncUploadController { OrderDao mapper = batchSession.getMapper(OrderDao.class); for (OrderEntity orderEntity : orderEntities) { orderEntity.setUpdateTime(null); + orderEntity.setFromType(ConstantStatus.FROM_UDIWMS); + orderEntity.setReceiveStatus(0); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderService.deleteByOrderId(orderEntity.getId()); mapper.importOrder(orderEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java index b60dc17..4f8c860 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/utils/CheckOrderUtils.java @@ -191,6 +191,11 @@ public class CheckOrderUtils { return ConstantStatus.SORDER_CHECKED; } } + else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { + if (bussinessTypeEntity.isSecCheckUdiwms()) { + return ConstantStatus.SORDER_CHECKED; + } + } } else { return ConstantStatus.SORDER_DELIVER; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java index 04e17aa..ff2074d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java @@ -58,4 +58,7 @@ public class BussinessTypeEntity { private String localPrefix; private boolean preIn; + private boolean checkUdiwms; + private boolean secCheckUdiwms; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java index 9bf0208..6768006 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java @@ -58,4 +58,6 @@ public class BussinessTypResponse { private String prefix; private String localPrefix; private boolean preIn; + private boolean checkUdiwms; + private boolean secCheckUdiwms; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java index cac5bba..4ba296a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/InvProductsTrService.java @@ -501,6 +501,7 @@ public class InvProductsTrService { outOrder.setLocStorageCode(defaultWarehouseEntity.getCode()); outOrder.setCreateUser(null); outOrder.setReviewUser(null); + outOrder.setPreCheck(false); orderService.insertOrder(outOrder); for (WarehouseEntity warehouseEntity : preOutList) { warehouseEntity.setOrderId(outOrder.getId()); @@ -576,6 +577,7 @@ public class InvProductsTrService { outOrder.setOriginUllageSupNo(orderEntity.getId()); outOrder.setCreateUser(null); outOrder.setReviewUser(null); + outOrder.setPreCheck(false); orderService.insertOrder(outOrder); for (WarehouseEntity warehouseEntity : temps) { warehouseEntity.setOrderId(outOrder.getId()); @@ -619,6 +621,7 @@ public class InvProductsTrService { outOrder.setOriginUllageSupNo(orderEntity.getId()); outOrder.setCreateUser(null); outOrder.setReviewUser(null); + outOrder.setPreCheck(false); orderService.insertOrder(outOrder); warehouseEntity.setOrderId(outOrder.getId()); warehouseEntity.setId(null); @@ -690,6 +693,7 @@ public class InvProductsTrService { outOrder.setOriginUllageSupNo(orderEntity.getId()); outOrder.setCreateUser(null); outOrder.setReviewUser(null); + outOrder.setPreCheck(false); orderService.insertOrder(outOrder); for (WarehouseEntity warehouseEntity : temps) { warehouseEntity.setOrderId(outOrder.getId()); @@ -768,6 +772,7 @@ public class InvProductsTrService { outOrder.setOriginUllageSupNo(orderEntity.getId()); outOrder.setCreateUser(null); outOrder.setReviewUser(null); + outOrder.setPreCheck(false); orderService.insertOrder(outOrder); for (WarehouseEntity warehouseEntity : temps) { warehouseEntity.setOrderId(outOrder.getId()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java index c233520..86aada2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java @@ -584,6 +584,11 @@ public class IoTransInoutService { unCheckFinish(orderEntity, warehouseEntityList); return; } + }else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDIWMS) { + if (!bussinessTypeEntity.isSecCheckUdiwms()) { + unCheckFinish(orderEntity, warehouseEntityList); + return; + } } genOrderDetail(warehouseEntityList); // checkMutiDi(orderEntity.getId(), bussinessTypeEntity); //校验一个DI是否绑定多个产品ID