From 8697028d0685afaf116d68a9fcda13e01fe0e9e3 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Fri, 24 Jun 2022 22:37:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E7=BB=A7=E6=9C=8D=E5=8A=A1=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E5=88=86=E5=BA=93bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SpsSyncDownloadService.java | 38 ++++++---- .../controller/inout/OrderController.java | 20 ++--- .../inout/StockOrderController.java | 3 +- .../controller/inout/WareHouseController.java | 21 +++++ .../inventory/InvSubWarehouseController.java | 29 ++++++- .../inventory/InvWarehouseController.java | 33 ++------ .../entity/basic/BussinessTypeEntity.java | 2 +- .../sale/admin/entity/inout/OrderEntity.java | 7 +- .../admin/entity/inout/StockOrderEntity.java | 1 + .../admin/entity/inout/WarehouseEntity.java | 5 +- .../inventory/InvSubWarehouseEntity.java | 2 +- .../sale/admin/req/inout/AddOrderRequest.java | 2 +- .../FilterInvSubWarehouseRequest.java | 2 +- .../inventory/FilterInvWarehouseRequest.java | 1 + .../admin/res/basic/BussinessTypResponse.java | 1 + .../admin/res/basic/SpsSyncDataResponse.java | 3 +- .../res/inventory/InvProductResponse.java | 1 + .../service/inout/impl/OrderServiceImpl.java | 17 ++++- .../inventory/InvSubWarehouseService.java | 3 + .../impl/InvSubWarehouseServiceImpl.java | 19 +++++ .../admin/thread/InvProductsTrService.java | 21 ++++- .../admin/thread/IoTransInoutService.java | 76 ++++++++++--------- .../mybatis/mapper/auth/AuthAdminDao.xml | 3 +- .../mybatis/mapper/basic/BussinessTypeDao.xml | 13 ++-- .../mybatis/mapper/inout/CodesTempDao.xml | 2 - .../mybatis/mapper/inout/OrderDao.xml | 35 +++++---- .../mybatis/mapper/inout/StockOrderDao.xml | 6 +- .../mapper/inventory/InvPreInProductDao.xml | 9 ++- .../mapper/inventory/InvPreProductDao.xml | 5 +- .../mapper/inventory/InvProductDao.xml | 11 ++- 30 files changed, 252 insertions(+), 139 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java index 998346b..1417cd6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/SpsSyncDownloadService.java @@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.auth.AuthAdmin; import com.glxp.sale.admin.entity.basic.*; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.*; +import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.param.SyncDataBustypeEntity; import com.glxp.sale.admin.entity.receipt.ProductInfoEntity; @@ -29,6 +30,7 @@ import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.basic.*; import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; import com.glxp.sale.admin.service.inout.*; +import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.admin.service.param.SyncDataSetService; import com.glxp.sale.admin.service.receipt.ProductInfoService; @@ -50,6 +52,8 @@ public class SpsSyncDownloadService { @Resource InvWarehouseService invWarehouseService; @Resource + InvSubWarehouseService invSubWarehouseService; + @Resource UdiRelevanceService udiRelevanceService; @Resource UdiInfoDao udiInfoDao; @@ -99,29 +103,35 @@ public class SpsSyncDownloadService { List invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); syncDataResponse.setInvWarehouseEntities(invWarehouseEntities); + //获取仓库分库 if (CollUtil.isNotEmpty(invWarehouseEntities)) { + List mInvSubWarehouseEntities = new ArrayList<>(); List mWarehouseBussinessTypeEntities = new ArrayList<>(); List mWarehouseUserEntities = new ArrayList<>(); for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) { - //仓库关联单据类型 - FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); - filterInvBusTypeRequest.setCode(invWarehouseEntity.getCode()); - List warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); - mWarehouseBussinessTypeEntities.addAll(warehouseBussinessTypeEntities); - //仓库关联用户 - FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); - filterInvUserRequest.setCode(invWarehouseEntity.getCode()); - List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); - mWarehouseUserEntities.addAll(warehouseUserEntities); - + List invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode()); + if (CollUtil.isNotEmpty(invSubWarehouseEntities)) { + mInvSubWarehouseEntities.addAll(invSubWarehouseEntities); + for (InvSubWarehouseEntity invSubWarehouseEntity : invSubWarehouseEntities) { + //仓库关联单据类型 + FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest(); + filterInvBusTypeRequest.setCode(invSubWarehouseEntity.getCode()); + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest); + mWarehouseBussinessTypeEntities.addAll(warehouseBussinessTypeEntities); + //仓库关联用户 + FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); + filterInvUserRequest.setCode(invWarehouseEntity.getCode()); + List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); + mWarehouseUserEntities.addAll(warehouseUserEntities); + } + } } + + syncDataResponse.setInvSubWarehouseEntities(mInvSubWarehouseEntities); syncDataResponse.setWarehouseUserEntities(mWarehouseUserEntities); syncDataResponse.setWarehouseBussinessTypeEntities(mWarehouseBussinessTypeEntities); - } - - } if (syncDataSetEntity.isBasicProducts()) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 83ee56a..43cb70c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -203,20 +203,6 @@ public class OrderController { Integer userId = customerService.getUserId(); orderFilterRequest.setFromCorpId(null); orderFilterRequest.setUserId(userId); -// if (StrUtil.isNotEmpty(orderFilterRequest.getLocStorageCode())) { -// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(orderFilterRequest.getLocStorageCode()); -// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); -// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); -// filterInvUserRequest.setUserid(userId.longValue()); -// filterInvUserRequest.setIsDirector(true); -// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); -// if (CollUtil.isEmpty(warehouseUserEntities)) { -// orderFilterRequest.setUnionUser(userId); -// } -// } else { -// return ResultVOUtils.error(500, "请先选择当前仓库"); -// } - } else { orderFilterRequest.setCustomerId(null); orderFilterRequest.setFromCorpId(companyEntity.getUnitIdFk()); @@ -448,6 +434,9 @@ public class OrderController { stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); stockOrderEntity.setAuditTime(new Date()); + if (StrUtil.isEmpty(stockOrderEntity.getInvWarehouseCode())) { + stockOrderEntity.setInvWarehouseCode(authAdmin.getLocSubInvCode()); + } stockOrderEntity.setEntrustEnd(true); stockOrderService.updateById(stockOrderEntity); } @@ -459,6 +448,9 @@ public class OrderController { for (StockOrderEntity stockOrderEntity : stockOrderEntityLit) { stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER); stockOrderEntity.setReviewUser(authAdmin.getId().intValue()); + if (StrUtil.isEmpty(stockOrderEntity.getInvWarehouseCode())) { + stockOrderEntity.setInvWarehouseCode(authAdmin.getLocSubInvCode()); + } stockOrderEntity.setAuditTime(new Date()); stockOrderService.updateById(stockOrderEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java index b5cf0aa..6469a53 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java @@ -192,7 +192,7 @@ public class StockOrderController { } stockOrderEntity.setCustomerId(stockOrderPostRequest.getCustomerId()); - stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); + stockOrderEntity.setBilldate(DateUtil.formatDateTime(new Date())); b = stockOrderService.insertStockOrder(stockOrderEntity); } else { stockOrderService.updateById(stockOrderEntity); @@ -397,6 +397,7 @@ public class StockOrderController { String replicateNo = originOrder.getReplicateNo(); //复制单号 List originCodes = codesService.findByReceiptId(originOrder.getId()); originOrder.setActDate(DateUtil.formatDate(new Date())); + originOrder.setCreateTime(originOrder.getActDate()); originOrder.setFromCorp(addStockOrderChangeRequest.getFromCorp()); originOrder.setFromCorpId(addStockOrderChangeRequest.getFromCorpId()); originOrder.setCorpOrderId(CustomUtil.getId() + "x"); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 994b1df..2adbe28 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -233,6 +233,25 @@ public class WareHouseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + OrderEntity orderEntity = orderService.findById(commitRequest.getOrderId()); + if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_PROCESS) { + return ResultVOUtils.error(500, "单据已提交！"); + } + + ioTransInoutService.repeatCommit(commitRequest); + return ResultVOUtils.success("提交成功"); + } + + @AuthRuleAnnotation("") + @PostMapping("/warehouse/inout/repeatCommitOrder")//TODO 重新提交 + public BaseResponse repeatCommitOrder(@RequestBody CommitRequest commitRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + ioTransInoutService.repeatCommit(commitRequest); return ResultVOUtils.success("提交成功"); } @@ -795,6 +814,7 @@ public class WareHouseController { orderSaveRequest.setId(orderId); if (addOrderRequest.getActDate() != null) { orderSaveRequest.setActDate(addOrderRequest.getActDate()); + orderSaveRequest.setCreateTime(orderSaveRequest.getActDate()); } Integer userId = customerService.getUserId(); @@ -817,6 +837,7 @@ public class WareHouseController { orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN); orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN); orderSaveRequest.setInvWarehouseCode(addOrderRequest.getInvWarehouseCode()); + orderSaveRequest.setFromSubInvCode(addOrderRequest.getFromSubInvCode()); orderSaveRequest.setCustomerId(customerId + ""); orderService.insertOrder(orderSaveRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 1f574f0..01c53b2 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -13,6 +13,7 @@ import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest; import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest; import com.glxp.sale.admin.res.inventory.InvWarehouseResponse; import com.glxp.sale.admin.service.auth.CustomerService; +import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService; import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.inventory.InvWarehouseService; import com.glxp.sale.common.enums.ResultEnum; @@ -40,6 +41,8 @@ public class InvSubWarehouseController { InvWarehouseService invWarehouseService; @Resource CustomerService customerService; + @Resource + WarehouseBussinessTypeService warehouseBussinessTypeService; @AuthRuleAnnotation("") @GetMapping("spms/sub/inv/warehouse/filter") @@ -56,8 +59,13 @@ public class InvSubWarehouseController { // if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } + AuthAdmin authAdmin = customerService.getUserBean(); - filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); + if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { + if (authAdmin.getCustomerId() == 110) + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); + } + List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); return ResultVOUtils.success(invSubWarehouseEntities); } @@ -83,7 +91,7 @@ public class InvSubWarehouseController { } else { invSubWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + ""); } - invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId()); + invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); boolean b = invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -99,7 +107,7 @@ public class InvSubWarehouseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - if (invSubWarehouseEntity.getId() == 0) { + if (invSubWarehouseEntity.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } boolean b = invSubWarehouseService.updateInvSubWarehouse(invSubWarehouseEntity); @@ -117,7 +125,22 @@ public class InvSubWarehouseController { if (deleteRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findById(deleteRequest.getId()); + + FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); + filterInvWarehouseRequest.setCode(invSubWarehouseEntity.getParentId()); + List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); + if (!warehouseEntities.isEmpty()) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + } + + List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invSubWarehouseEntity.getCode()); + if (!warehouseBussinessTypeEntities.isEmpty()) { + return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + } boolean b = invSubWarehouseService.deleteById(deleteRequest.getId()); + if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index 20e817a..09c0b96 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -1,6 +1,7 @@ package com.glxp.sale.admin.controller.inventory; import cn.hutool.Hutool; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; @@ -249,7 +250,7 @@ public class InvWarehouseController { invWarehouseEntity.setUpdateTime(new Date()); boolean b = invWarehouseService.insertInvWarehouse(invWarehouseEntity); InvSubWarehouseEntity invSubWarehouseEntity = new InvSubWarehouseEntity(); - invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId()); + invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + ""); invSubWarehouseEntity.setParentId(invWarehouseEntity.getCode()); invSubWarehouseEntity.setName(invWarehouseEntity.getName()); invSubWarehouseEntity.setCode(Integer.parseInt(invWarehouseEntity.getCode()) * 1000 + ""); @@ -297,19 +298,10 @@ public class InvWarehouseController { return ResultVOUtils.error(500, "该仓库已有库存，不能删除！"); } - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setCode(invWarehouseEntity.getCode()); - List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); - if (!warehouseEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); - } - - List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invWarehouseEntity.getCode()); - if (!warehouseBussinessTypeEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + List invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode()); + if (CollUtil.isNotEmpty(invSubWarehouseEntities)) { + return ResultVOUtils.error(500, "请先移除该仓库关联的分库！"); } - - boolean b = invWarehouseService.deleteById(deleteRequest.getId()); if (!b) { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); @@ -324,18 +316,9 @@ public class InvWarehouseController { if (request.getCode() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(request.getCode()); - FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); - filterInvWarehouseRequest.setCode(invWarehouseEntity.getCode()); - List warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); - if (!warehouseEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); - } - - List warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invWarehouseEntity.getCode()); - if (!warehouseBussinessTypeEntities.isEmpty()) { - return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！"); + List invSubWarehouseEntities = invSubWarehouseService.findByParentId(request.getCode()); + if (CollUtil.isNotEmpty(invSubWarehouseEntities)) { + return ResultVOUtils.error(500, "请先移除该仓库关联的分库！"); } 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 0864bfe..18d4f16 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 @@ -65,5 +65,5 @@ public class BussinessTypeEntity { private boolean scanPreIn; private boolean vailInv; private boolean codeFillCheck; - + private String defaultSubInv; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java index 8394fdf..a207fe9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/OrderEntity.java @@ -11,11 +11,12 @@ public class OrderEntity { private String corpOrderId; private String action; private String actDate; - private String actor; private String mainAction; private String fromCorpId; private String fromCorp; + + private Integer status; private Integer fromType; @@ -54,7 +55,9 @@ public class OrderEntity { //复制单号，多个单号之间使用英文逗号,分隔 private String replicateNo; - private boolean syncOutChange;//同步后是否可以缺量补单 + private String createTime; + private String fromSubInvCode; + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java index 1b17d0d..d86d598 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java @@ -30,6 +30,7 @@ public class StockOrderEntity { private BigDecimal totalPrice; private String locStorageCode; private String invWarehouseCode; + private String fromSubInvCode; //补单单号 private String supplementNo; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java index d2a863f..95aeed6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inout/WarehouseEntity.java @@ -31,15 +31,14 @@ public class WarehouseEntity { private String relId; private Integer status; private String locStorageCode; - - + private String fromSubInvCode; private String mySupId; public String getSupId() { if (supId == null) { return null; - }else if(supId.equals("")) + } else if (supId.equals("")) return null; return supId; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java index 0af3425..21c87c6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class InvSubWarehouseEntity { - private long id; + private String id; private String code; private String name; private String parentId; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java index bffebfb..e08ae79 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java @@ -26,7 +26,7 @@ public class AddOrderRequest { private boolean ignoreRecentExpire; private boolean ignoreCode; private boolean preCheck; - + private String fromSubInvCode; private boolean vailInv; private boolean codeFillCheck; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvSubWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvSubWarehouseRequest.java index e70f01d..494de2f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvSubWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvSubWarehouseRequest.java @@ -6,7 +6,7 @@ import lombok.Data; @Data public class FilterInvSubWarehouseRequest extends ListPageRequest { - private Integer id; + private String id; private String code; private String name; private String parentId; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java index cd53545..283e4d3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java @@ -24,4 +24,5 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private String lastUpdateTime; private List ids; private Boolean spUse; + private Integer filter; } 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 8d832ef..83cb047 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 @@ -67,4 +67,5 @@ public class BussinessTypResponse { private boolean codeFillCheck; + private String defaultSubInv; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java index 53df1d9..e810a74 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/SpsSyncDataResponse.java @@ -7,6 +7,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity; import com.glxp.sale.admin.entity.inout.WarehouseUserEntity; +import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity; import com.glxp.sale.admin.entity.thrsys.*; import lombok.Data; @@ -28,9 +29,9 @@ public class SpsSyncDataResponse { List thrOrderEntities; List companyProductRelevanceEntities; List udiRelevanceEntities; - List warehouseBussinessTypeEntities; List warehouseUserEntities; + List invSubWarehouseEntities; List authAdminList; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java index 9931bde..f57d24a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inventory/InvProductResponse.java @@ -23,6 +23,7 @@ public class InvProductResponse { private String unitFk; private String invStorageCode; private String invStorageName; + private String invSubStorageName; public Integer getInCount() { if (inCount == null) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java index 0e53a90..9b67d42 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java @@ -18,6 +18,7 @@ import com.glxp.sale.admin.entity.inout.StockOrderEntity; import com.glxp.sale.admin.entity.inout.WarehouseEntity; import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity; import com.glxp.sale.admin.entity.inventory.InvProductEntity; +import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity; import com.glxp.sale.admin.entity.param.SystemParamConfigEntity; import com.glxp.sale.admin.req.inout.OrderFilterRequest; import com.glxp.sale.admin.req.inout.OrderQueryRequest; @@ -27,6 +28,7 @@ import com.glxp.sale.admin.req.inventory.FilterInvProductRequest; import com.glxp.sale.admin.res.inout.OrderNoResult; import com.glxp.sale.admin.res.inout.StockOrderResponse; import com.glxp.sale.admin.service.inout.OrderService; +import com.glxp.sale.admin.service.inventory.InvSubWarehouseService; import com.glxp.sale.admin.service.param.SystemParamConfigService; import com.glxp.sale.admin.util.*; import com.glxp.sale.common.enums.ResultEnum; @@ -56,6 +58,8 @@ public class OrderServiceImpl implements OrderService { @Resource InvWarehouseDao invWarehouseDao; @Resource + InvSubWarehouseService invSubWarehouseService; + @Resource CodesDao codesDao; @Resource CodesTempDao codesTempDao; @@ -254,7 +258,18 @@ public class OrderServiceImpl implements OrderService { //修改往来单位及当前库存号 supplementOrder.setFromCorpId(order.getLocStorageCode()); supplementOrder.setLocStorageCode(order.getFromCorpId()); + supplementOrder.setInvWarehouseCode(null); String name = invWarehouseDao.getNameByCode(supplementOrder.getFromCorpId()); + if (StrUtil.isNotEmpty(order.getFromSubInvCode())) { + supplementOrder.setInvWarehouseCode(order.getFromSubInvCode()); + } else { + List invSubWarehouseEntities = invSubWarehouseService.findByParentId(supplementOrder.getLocStorageCode()); + if (CollUtil.isNotEmpty(invSubWarehouseEntities) && invSubWarehouseEntities.size() == 1) { + supplementOrder.setInvWarehouseCode(invSubWarehouseEntities.get(0).getCode()); + } + } + + supplementOrder.setFromCorp(name); supplementOrder.setFromType(ConstantStatus.FROM_PEACE_CHANGE); @@ -275,6 +290,7 @@ public class OrderServiceImpl implements OrderService { supplementCode.setFromCorpId(supplementOrder.getFromCorpId()); supplementCode.setFromCorp(supplementOrder.getFromCorp()); supplementCode.setLocStorageCode(supplementOrder.getLocStorageCode()); + supplementCode.setInvWarehouseCode(supplementOrder.getInvWarehouseCode()); supplementCode.setOrderId(supplementOrderNo); //查询补单设置 supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType()); @@ -371,7 +387,6 @@ public class OrderServiceImpl implements OrderService { * 查询指定单据关联的所有单据 * * @param orderEntity - * @param orders */ @Override public List getAllOrder(OrderEntity orderEntity) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java index be3792f..3548bc4 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java @@ -9,12 +9,15 @@ import java.util.List; public interface InvSubWarehouseService { + InvSubWarehouseEntity findById(String id); + List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); List filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest); InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest); + List findByParentId(String code); InvSubWarehouseEntity findByInvSubByCode(String code); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java index 4be4c05..109f67c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java @@ -21,6 +21,17 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { @Resource InvSubWarehouseDao invSubWarehouseDao; + @Override + public InvSubWarehouseEntity findById(String id) { + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + filterInvSubWarehouseRequest.setId(id); + List data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + if (CollUtil.isNotEmpty(data)) { + return data.get(0); + } + return null; + } + @Override public List filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) { if (filterInvSubWarehouseRequest == null) { @@ -52,6 +63,14 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService { return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest); } + @Override + public List findByParentId(String code) { + FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); + filterInvSubWarehouseRequest.setParentId(code); + List invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest); + return invSubWarehouseEntities; + } + @Override public InvSubWarehouseEntity findByInvSubByCode(String code) { FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest(); 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 780ec13..6cc154b 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 @@ -100,7 +100,7 @@ public class InvProductsTrService { if (bussinessTypeEntity.isPreIn()) { InvProductEntity invPreProductEntity = invPreInProductService.selectByUuid(erpOrderEntity.getGoodsid(), erpOrderEntity.getBatchNo(), warehouseEntity.getSupId() - , null, null); + , warehouseEntity.getLocStorageCode(), warehouseEntity.getInvWarehouseCode()); if (invPreProductEntity == null) { invPreProductEntity = buildInvProduct(erpOrderEntity.getGoodsid(), erpOrderEntity, orderEntity, warehouseEntity); invPreInProductService.insertInvProduct(invPreProductEntity); @@ -496,6 +496,7 @@ public class InvProductsTrService { OrderEntity outOrder = new OrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(outOrder.getActDate()); outOrder.setAction(bussinessChangeTypeEntity.getScAction()); outOrder.setMainAction(ConstantType.TYPE_OUT); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); @@ -566,6 +567,7 @@ public class InvProductsTrService { OrderEntity outOrder = new OrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(outOrder.getActDate()); outOrder.setAction(bussinessChangeTypeEntity.getScAction()); outOrder.setMainAction(ConstantType.TYPE_PUT); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); @@ -612,6 +614,7 @@ public class InvProductsTrService { OrderEntity outOrder = new OrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(outOrder.getActDate()); outOrder.setAction(bussinessChangeTypeEntity.getScAction()); outOrder.setMainAction(ConstantType.TYPE_PUT); SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); @@ -685,6 +688,7 @@ public class InvProductsTrService { BeanUtils.copyProperties(orderEntity, outOrder); outOrder.setSupplementNo(null);//补单需置空 outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(outOrder.getActDate()); outOrder.setAction(bussinessChangeTypeEntity.getScAction()); outOrder.setMainAction(ConstantType.TYPE_PUT); outOrder.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); @@ -695,8 +699,19 @@ public class InvProductsTrService { outOrder.setId(orderNo); outOrder.setFromCorpId(corpName); outOrder.setFromCorp(temps.get(0).getFromCorp()); + + BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction()); + if (StrUtil.isNotEmpty(originBT.getDefaultSubInv())) { + outOrder.setFromSubInvCode(originBT.getDefaultSubInv()); + } + if (StrUtil.isNotEmpty(bussinessTypeEntity.getDefaultSubInv())) { + outOrder.setFromSubInvCode(bussinessTypeEntity.getDefaultSubInv()); + } + outOrder.setCorpOrderId(CustomUtil.getId() + "x"); outOrder.setLocStorageCode(orderEntity.getLocStorageCode()); + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("additional_auto_submit"); if ("1".equals(systemParamConfigEntity.getParamValue())) { outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); @@ -720,6 +735,7 @@ public class InvProductsTrService { warehouseEntity.setFromCorp(outOrder.getFromCorp()); warehouseEntity.setFromCorpId(outOrder.getFromCorpId()); warehouseEntity.setLocStorageCode(outOrder.getLocStorageCode()); + warehouseEntity.setInvWarehouseCode(outOrder.getInvWarehouseCode()); warehouseEntity.setAction(bussinessChangeTypeEntity.getScAction()); warehouseEntity.setMainAction(ConstantType.TYPE_PUT); } @@ -760,6 +776,7 @@ public class InvProductsTrService { OrderEntity outOrder = new OrderEntity(); BeanUtils.copyProperties(orderEntity, outOrder); outOrder.setActDate(DateUtil.getBeforeDay(outOrder.getActDate(), bussinessChangeTypeEntity.getBeforeTime())); + outOrder.setCreateTime(outOrder.getActDate()); outOrder.setAction(bussinessChangeTypeEntity.getScAction()); outOrder.setMainAction(ConstantType.TYPE_PUT); if (orderEntity.isError()) { @@ -874,7 +891,7 @@ public class InvProductsTrService { invProductDetailEntity.setAction(warehouseEntity.getAction()); invProductDetailEntity.setMainAction(orderEntity.getMainAction()); invProductDetailEntity.setInvStorageCode(warehouseEntity.getLocStorageCode()); - invProductDetailEntity.setInvWarehouseCode(warehouseEntity.getWarehouseCode()); + invProductDetailEntity.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); invProductDetailEntity.setOrderIdFk(warehouseEntity.getOrderId()); invProductDetailEntity.setCount(actCount * warehouseEntity.getCount()); if (purchaseType != null) { 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 388166a..6dc74a6 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 @@ -95,42 +95,56 @@ public class IoTransInoutService { @Resource GennerOrderUtils gennerOrderUtils; - //web端新增订单， + + //手持终端生成订单，插入零时表 @Async - public void creatOrderWeb(PostOrderRequest postOrderRequest) { + public void creatOrder(PostOrderRequest postOrderRequest) { List postOrders = postOrderRequest.getPostOrder(); if (postOrders != null && postOrders.size() > 0) { for (int i = 0; i < postOrders.size(); i++) { PostOrderRequest.PostOrder postOrder = postOrders.get(i); List warehouseEntityList = postOrder.getCodes(); if (warehouseEntityList != null && warehouseEntityList.size() > 0) { - if (StringUtils.isNotBlank(postOrderRequest.getOldOrderId())) { - orderService.deleteById(postOrderRequest.getOldOrderId()); - myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId()); + + //解析条码 + for (WarehouseEntity temp : warehouseEntityList) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(temp.getCode()); + temp.setNameCode(udiEntity.getUdi()); } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); - BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(warehouseEntity.getAction()); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); String orderId = orderNo; + OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { orderSaveRequest.setActDate(warehouseEntity.getActDate()); + orderSaveRequest.setCreateTime(orderSaveRequest.getActDate()); } - orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId()); orderSaveRequest.setAction(warehouseEntity.getAction()); orderSaveRequest.setActor(warehouseEntity.getActor()); orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpId()); - orderSaveRequest.setReceiveStatus(0); - orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); + orderSaveRequest.setOutChangeEnable(postOrder.isOutChangeEnable()); + orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId()); + + if (postOrderRequest.getCustomerId().equals("110")) { + orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); + } orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); + orderSaveRequest.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); + orderSaveRequest.setFromSubInvCode(warehouseEntity.getFromSubInvCode()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); + orderSaveRequest.setReceiveStatus(0); + orderSaveRequest.setPreCheck(postOrder.isPreCheck()); + orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); - orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW); - orderSaveRequest.setStatus(postOrderRequest.getSubmitType() == 0 ? - ConstantStatus.ORDER_STATUS_PROCESS : ConstantStatus.ORDER_STATUS_TEMP_SAVE); + if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0) + orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED); + else + orderSaveRequest.setFromType(ConstantStatus.FROM_PDAUN); + orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderSaveRequest.setStockCheckFk(postOrder.getStockIdFk()); orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); @@ -156,53 +170,43 @@ public class IoTransInoutService { } } - //手持终端生成订单，插入零时表 + //web端新增订单， @Async - public void creatOrder(PostOrderRequest postOrderRequest) { + public void creatOrderWeb(PostOrderRequest postOrderRequest) { List postOrders = postOrderRequest.getPostOrder(); if (postOrders != null && postOrders.size() > 0) { for (int i = 0; i < postOrders.size(); i++) { PostOrderRequest.PostOrder postOrder = postOrders.get(i); List warehouseEntityList = postOrder.getCodes(); if (warehouseEntityList != null && warehouseEntityList.size() > 0) { - - //解析条码 - for (WarehouseEntity temp : warehouseEntityList) { - UdiEntity udiEntity = FilterUdiUtils.getUdi(temp.getCode()); - temp.setNameCode(udiEntity.getUdi()); + if (StringUtils.isNotBlank(postOrderRequest.getOldOrderId())) { + orderService.deleteById(postOrderRequest.getOldOrderId()); + myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId()); } WarehouseEntity warehouseEntity = warehouseEntityList.get(0); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(warehouseEntity.getAction()); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + MyStrUtil.trim(bussinessTypeEntity.getPrefix()), "yyyyMMdd")); String orderId = orderNo; - OrderEntity orderSaveRequest = new OrderEntity(); orderSaveRequest.setId(orderId); if (warehouseEntity.getActDate() != null) { orderSaveRequest.setActDate(warehouseEntity.getActDate()); + orderSaveRequest.setCreateTime(orderSaveRequest.getActDate()); } + orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId()); orderSaveRequest.setAction(warehouseEntity.getAction()); orderSaveRequest.setActor(warehouseEntity.getActor()); orderSaveRequest.setCorpOrderId(warehouseEntity.getCorpOrderId()); orderSaveRequest.setFromCorpId(warehouseEntity.getFromCorpId()); - orderSaveRequest.setOutChangeEnable(postOrder.isOutChangeEnable()); - orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId()); - - if (postOrderRequest.getCustomerId().equals("110")) { - orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); - } + orderSaveRequest.setReceiveStatus(0); + orderSaveRequest.setCreateUser(postOrderRequest.getUserId()); orderSaveRequest.setLocStorageCode(warehouseEntity.getLocStorageCode()); - orderSaveRequest.setInvWarehouseCode(warehouseEntity.getInvWarehouseCode()); orderSaveRequest.setMainAction(warehouseEntity.getMainAction()); - orderSaveRequest.setReceiveStatus(0); - orderSaveRequest.setPreCheck(postOrder.isPreCheck()); - orderSaveRequest.setFromCorp(warehouseEntity.getFromCorp()); - if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0) - orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED); - else - orderSaveRequest.setFromType(ConstantStatus.FROM_PDAUN); - orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); + orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW); + orderSaveRequest.setStatus(postOrderRequest.getSubmitType() == 0 ? + ConstantStatus.ORDER_STATUS_PROCESS : ConstantStatus.ORDER_STATUS_TEMP_SAVE); orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderSaveRequest.setStockCheckFk(postOrder.getStockIdFk()); orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); @@ -228,6 +232,7 @@ public class IoTransInoutService { } } + @Async public void createOrderUdims(PostUdimsOrderRequest postUdimsOrderRequest) { CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(postUdimsOrderRequest.getCustomerId())); @@ -246,6 +251,7 @@ public class IoTransInoutService { orderEntity.setReceiveStatus(0); orderEntity.setMainAction(ConstantType.TYPE_PUT); orderEntity.setActDate(DateUtil.formatDateTime(new Date())); + orderEntity.setCreateTime(orderEntity.getActDate()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); orderEntity.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_UN); diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index ad84515..8e9ccbb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -98,7 +98,8 @@ INSERT INTO - auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode) + auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag + ,employeeName,CustomerId,lastModifyTime,locInvCode,locSubInvCode) values (#{userName}, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 4324379..d8dedc1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -19,7 +19,7 @@ basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne, basic_bussiness_type.secCheckBalacne, defaultUnit,basic_bustype_origin.action thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix - localPrefix,basic_bustype_local.preIn + localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv FROM basic_bussiness_type LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action @@ -133,7 +133,7 @@ basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode,basic_bussiness_type.checkBalacne,defaultUnit, basic_bussiness_type.secCheckBalacne,basic_bustype_origin.action thirdAction,basic_bustype_origin.thirdSys,useDyCount,basic_bussiness_type.expireTip,basic_bussiness_type.prefix,basic_bustype_local.prefix - localPrefix,basic_bustype_local.preIn + localPrefix,basic_bustype_local.preIn,basic_bussiness_type.defaultSubInv FROM basic_bussiness_type LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction = basic_bustype_local.action left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action @@ -187,7 +187,7 @@ ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, secCheckChange,corpType,basic_bussiness_type.storageCode,checkBalacne, secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix - ,ullageFill,scanPreIn,vailInv,codeFillCheck) + ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv) values ( #{action}, @@ -225,7 +225,7 @@ #{prefix}, #{ullageFill}, #{scanPreIn}, - #{vailInv},#{codeFillCheck} + #{vailInv},#{codeFillCheck},#{defaultSubInv} ) @@ -240,7 +240,7 @@ checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew, secCheckChange,corpType,storageCode,checkBalacne,secCheckBalacne,supplementOrderType,defaultUnit,useDyCount,expireTip,updateTime,prefix - ,ullageFill,scanPreIn,vailInv,codeFillCheck) + ,ullageFill,scanPreIn,vailInv,codeFillCheck,defaultSubInv) values ( #{index}, @@ -279,7 +279,7 @@ #{prefix}, #{ullageFill}, #{scanPreIn}, - #{vailInv},#{codeFillCheck} + #{vailInv},#{codeFillCheck},#{defaultSubInv} ) @@ -324,6 +324,7 @@ vailInv=#{vailInv}, prefix=#{prefix}, codeFillCheck=#{codeFillCheck}, + defaultSubInv=#{defaultSubInv}, thirdSysFk=#{thirdSysFk}, diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml index 4aae706..ba8b78f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml @@ -147,7 +147,6 @@ `batchNo`=#{batchNo}, `serialNo`=#{serialNo}, `relId`=#{relId}, - `serialNo`=#{serialNo}, WHERE id=#{id} @@ -164,7 +163,6 @@ `supId`=#{supId}, `serialNo`=#{serialNo}, `relId`=#{relId}, - `serialNo`=#{serialNo}, WHERE orderId=#{orderId} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index a6ccef6..0a415fc 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -33,7 +33,8 @@ fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, - outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode) + outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode, + fromSubInvCode, createTime) values (#{id}, #{action}, #{corpOrderId}, @@ -53,7 +54,7 @@ #{stockCheckFk}, #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo}, #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck}, - #{updateTime}, #{replicateNo}, #{invWarehouseCode}) + #{updateTime}, #{replicateNo}, #{invWarehouseCode}, #{fromSubInvCode}, #{createTime}) @@ -64,7 +65,7 @@ fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus, receiveStatus, erpFk, stockCheckFk, customerId, supId, exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser, - outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode) + outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode,fromSubInvCode,createTime) values ( #{id}, #{action}, @@ -96,7 +97,8 @@ #{preCheck}, #{updateTime}, #{replicateNo}, - #{invWarehouseCode} + #{invWarehouseCode}, + #{fromSubInvCode},#{createTime} ) @@ -134,7 +136,10 @@ originUllageSupNo=#{originUllageSupNo}, preCheck=#{preCheck}, auditTime=#{auditTime}, - replicateNo=#{replicateNo} + replicateNo=#{replicateNo}, + fromSubInvCode=#{fromSubInvCode}, + createTime=#{createTime}, + WHERE id = #{id} @@ -248,7 +253,8 @@ and reviewUser =#{reviewUser} - and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or invWarehouseCode is null) + and (invWarehouseCode in (select code from inv_warehouse_user WHERE userId =#{userId}) or + invWarehouseCode is null) @@ -270,10 +276,10 @@ - - - - + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml index 29da59c..b40d2f8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml @@ -121,12 +121,13 @@ inv_pre_product.inCount,inv_pre_product.outCount ,inv_pre_product.reCount,inv_pre_product.customerId, basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name - invStorageName,inv_pre_product.invStorageCode,inv_pre_product.price + invStorageName,inv_pre_product.invStorageCode,inv_pre_product.price, inv_warehouse_sub.name invSubStorageName FROM inv_pre_product inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id inner join basic_products on basic_udirel.uuid = basic_products.uuid left join basic_corp on inv_pre_product.supId=basic_corp.erpId left join inv_warehouse on inv_warehouse.code=inv_pre_product.invStorageCode + left join inv_warehouse_sub on inv_warehouse_sub.parentId = inv_warehouse.code basic_products.diType=1 @@ -188,7 +189,7 @@ GROUP BY #{groupType} - + group by inv_prein_product.id diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml index 1dfa02b..9ee5fdb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml @@ -20,7 +20,7 @@ AND inv_product.ggxh like concat('%',#{ggxh},'%') - AND inv_product.batchNo like concat('%',#{batchNo},'%') + AND inv_product.batchNo like concat('%',#{batchNo},'%') AND batchNo is NULL @@ -104,8 +104,8 @@ @@ -120,12 +120,14 @@ basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh, inv_product.inCount,inv_product.outCount ,inv_product.reCount,inv_product.customerId,basic_corp.name companyName,inv_product.unitFk,inv_product.supId - ,inv_warehouse.name invStorageName,inv_product.invStorageCode,inv_product.price + ,inv_warehouse.name invStorageName,inv_product.invStorageCode,inv_product.price, + inv_warehouse_sub.name invSubStorageName FROM inv_product inner join basic_udirel on inv_product.relIdFk = basic_udirel.id inner join basic_products on basic_udirel.uuid = basic_products.uuid left join basic_corp on inv_product.supId=basic_corp.erpId left join inv_warehouse on inv_warehouse.code=inv_product.invStorageCode + left join inv_warehouse_sub on inv_warehouse_sub.code = inv_product.invWarehouseCode basic_products.diType=1 @@ -182,6 +184,7 @@ GROUP BY #{groupType} + group by inv_product.id