中继服务同步问题，分库bug修复

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<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest);
             syncDataResponse.setInvWarehouseEntities(invWarehouseEntities);
 
+            //获取仓库分库
             if (CollUtil.isNotEmpty(invWarehouseEntities)) {
 
+                List<InvSubWarehouseEntity> mInvSubWarehouseEntities = new ArrayList<>();
                 List<WarehouseBussinessTypeEntity> mWarehouseBussinessTypeEntities = new ArrayList<>();
                 List<WarehouseUserEntity> mWarehouseUserEntities = new ArrayList<>();
                 for (InvWarehouseEntity invWarehouseEntity : invWarehouseEntities) {
-                    //仓库关联单据类型
+                    List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode());
-                    FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
+                    if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
-                    filterInvBusTypeRequest.setCode(invWarehouseEntity.getCode());
+                        mInvSubWarehouseEntities.addAll(invSubWarehouseEntities);
-                    List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
+                        for (InvSubWarehouseEntity invSubWarehouseEntity : invSubWarehouseEntities) {
-                    mWarehouseBussinessTypeEntities.addAll(warehouseBussinessTypeEntities);
+                            //仓库关联单据类型
-                    //仓库关联用户
+                            FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
-                    FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
+                            filterInvBusTypeRequest.setCode(invSubWarehouseEntity.getCode());
-                    filterInvUserRequest.setCode(invWarehouseEntity.getCode());
+                            List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
-                    List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
+                            mWarehouseBussinessTypeEntities.addAll(warehouseBussinessTypeEntities);
-                    mWarehouseUserEntities.addAll(warehouseUserEntities);
+                            //仓库关联用户
-
+                            FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest();
+                            filterInvUserRequest.setCode(invWarehouseEntity.getCode());
+                            List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest);
+                            mWarehouseUserEntities.addAll(warehouseUserEntities);
+                        }
+                    }
                 }
+
+                syncDataResponse.setInvSubWarehouseEntities(mInvSubWarehouseEntities);
                 syncDataResponse.setWarehouseUserEntities(mWarehouseUserEntities);
                 syncDataResponse.setWarehouseBussinessTypeEntities(mWarehouseBussinessTypeEntities);
-
             }
-
-
         }
 
         if (syncDataSetEntity.isBasicProducts()) {

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<WarehouseUserEntity> 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);
                 }

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<WarehouseEntity> 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");

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);
             }

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<InvSubWarehouseEntity> 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<InvWarehouseEntity> warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
+        if (!warehouseEntities.isEmpty()) {
+            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
+        }
+
+        List<WarehouseBussinessTypeEntity> 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);
         }

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();
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(invWarehouseEntity.getCode());
-        filterInvWarehouseRequest.setCode(invWarehouseEntity.getCode());
+        if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
-        List<InvWarehouseEntity> warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
+            return ResultVOUtils.error(500, "请先移除该仓库关联的分库！");
-        if (!warehouseEntities.isEmpty()) {
-            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
-        }
-
-        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invWarehouseEntity.getCode());
-        if (!warehouseBussinessTypeEntities.isEmpty()) {
-            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);
         }
-
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.findByParentId(request.getCode());
-        InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(request.getCode());
+        if (CollUtil.isNotEmpty(invSubWarehouseEntities)) {
-        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+            return ResultVOUtils.error(500, "请先移除该仓库关联的分库！");
-        filterInvWarehouseRequest.setCode(invWarehouseEntity.getCode());
-        List<InvWarehouseEntity> warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
-        if (!warehouseEntities.isEmpty()) {
-            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
-        }
-
-        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invWarehouseEntity.getCode());
-        if (!warehouseBussinessTypeEntities.isEmpty()) {
-            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
         }
 
 

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;
 }

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;
+
 }

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;

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;
     }

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;

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;
 

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;

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<Integer> ids;
     private Boolean spUse;
+    private Integer filter;
 }

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;
 }

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<ThrOrderEntity> thrOrderEntities;
     List<CompanyProductRelevanceEntity> companyProductRelevanceEntities;
     List<UdiRelevanceEntity> udiRelevanceEntities;
-
     List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities;
     List<WarehouseUserEntity> warehouseUserEntities;
+    List<InvSubWarehouseEntity> invSubWarehouseEntities;
     List<AuthAdmin> authAdminList;
 
 

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)

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<InvSubWarehouseEntity> 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<OrderEntity> getAllOrder(OrderEntity orderEntity) {

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<InvSubWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
     List<InvSubWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
 
     InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
+    List<InvSubWarehouseEntity> findByParentId(String code);
 
     InvSubWarehouseEntity findByInvSubByCode(String code);
 

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<InvSubWarehouseEntity> data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        if (CollUtil.isNotEmpty(data)) {
+            return data.get(0);
+        }
+        return null;
+    }
+
     @Override
     public List<InvSubWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
         if (filterInvSubWarehouseRequest == null) {
@@ -52,6 +63,14 @@ public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
         return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest);
     }
 
+    @Override
+    public List<InvSubWarehouseEntity> findByParentId(String code) {
+        FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+        filterInvSubWarehouseRequest.setParentId(code);
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        return invSubWarehouseEntities;
+    }
+
     @Override
     public InvSubWarehouseEntity findByInvSubByCode(String code) {
         FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();

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) {

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<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrder();
         if (postOrders != null && postOrders.size() > 0) {
             for (int i = 0; i < postOrders.size(); i++) {
                 PostOrderRequest.PostOrder postOrder = postOrders.get(i);
                 List<WarehouseEntity> 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.setOutChangeEnable(postOrder.isOutChangeEnable());
-                    orderSaveRequest.setCreateUser(postOrderRequest.getUserId());
+                    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);
+                    if (postOrder.getErpOrders() != null && postOrder.getErpOrders().size() > 0)
-                    orderSaveRequest.setStatus(postOrderRequest.getSubmitType() == 0 ?
+                        orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED);
-                            ConstantStatus.ORDER_STATUS_PROCESS : ConstantStatus.ORDER_STATUS_TEMP_SAVE);
+                    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<PostOrderRequest.PostOrder> postOrders = postOrderRequest.getPostOrder();
         if (postOrders != null && postOrders.size() > 0) {
             for (int i = 0; i < postOrders.size(); i++) {
                 PostOrderRequest.PostOrder postOrder = postOrders.get(i);
                 List<WarehouseEntity> warehouseEntityList = postOrder.getCodes();
                 if (warehouseEntityList != null && warehouseEntityList.size() > 0) {
-
+                    if (StringUtils.isNotBlank(postOrderRequest.getOldOrderId())) {
-                    //解析条码
+                        orderService.deleteById(postOrderRequest.getOldOrderId());
-                    for (WarehouseEntity temp : warehouseEntityList) {
+                        myErpOrderService.deleteByOrderId(postOrderRequest.getOldOrderId());
-                        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.setOutChangeEnable(postOrder.isOutChangeEnable());
+                    orderSaveRequest.setReceiveStatus(0);
-                    orderSaveRequest.setCustomerId(postOrderRequest.getCustomerId());
+                    orderSaveRequest.setCreateUser(postOrderRequest.getUserId());
-
-                    if (postOrderRequest.getCustomerId().equals("110")) {
-                        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_WEBNEW);
-                        orderSaveRequest.setFromType(ConstantStatus.FROM_PDAED);
+                    orderSaveRequest.setStatus(postOrderRequest.getSubmitType() == 0 ?
-                    else
+                            ConstantStatus.ORDER_STATUS_PROCESS : ConstantStatus.ORDER_STATUS_TEMP_SAVE);
-                        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);
@@ -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);

api-admin/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -98,7 +98,8 @@
 
     <insert id="insertAuthAdmin" keyProperty="id" parameterType="com.glxp.sale.admin.entity.auth.AuthAdmin">
         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},
         <choose>

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}
         )
     </insert>
 
@@ -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}
         )
     </insert>
 
@@ -324,6 +324,7 @@
             <if test="vailInv != null">vailInv=#{vailInv},</if>
             <if test="prefix != null">prefix=#{prefix},</if>
             <if test="codeFillCheck != null">codeFillCheck=#{codeFillCheck},</if>
+            <if test="defaultSubInv != null">defaultSubInv=#{defaultSubInv},</if>
 
             thirdSysFk=#{thirdSysFk},
         </trim>

api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml

@@ -147,7 +147,6 @@
             <if test="batchNo != null">`batchNo`=#{batchNo},</if>
             <if test="serialNo != null">`serialNo`=#{serialNo},</if>
             <if test="relId != null">`relId`=#{relId},</if>
-            <if test="serialNo != null">`serialNo`=#{serialNo},</if>
         </set>
         WHERE id=#{id}
     </update>
@@ -164,7 +163,6 @@
             <if test="supId != null">`supId`=#{supId},</if>
             <if test="serialNo != null">`serialNo`=#{serialNo},</if>
             <if test="relId != null">`relId`=#{relId},</if>
-            <if test="serialNo != null">`serialNo`=#{serialNo},</if>
         </set>
         WHERE orderId=#{orderId}
     </update>

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})
     </insert>
 
 
@@ -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}
         )
     </insert>
 
@@ -134,7 +136,10 @@
             <if test="originUllageSupNo != null">originUllageSupNo=#{originUllageSupNo},</if>
             <if test="preCheck != null">preCheck=#{preCheck},</if>
             <if test="auditTime != null">auditTime=#{auditTime},</if>
-            <if test="replicateNo != null and replicateNo != ''">replicateNo=#{replicateNo}</if>
+            <if test="replicateNo != null and replicateNo != ''">replicateNo=#{replicateNo},</if>
+            <if test="fromSubInvCode != null and fromSubInvCode != ''">fromSubInvCode=#{fromSubInvCode},</if>
+            <if test="createTime != null and createTime != ''">createTime=#{createTime},</if>
+
         </trim>
         WHERE id = #{id}
     </update>
@@ -248,7 +253,8 @@
                 and reviewUser =#{reviewUser}
             </if>
             <if test="userId != '' and userId!=null">
-                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)
             </if>
 
             <if test="ullageSupNo != '' and ullageSupNo!=null">
@@ -270,10 +276,10 @@
 
     </select>
 
-<!--    <if test="unionUser != '' and unionUser!=null">-->
+    <!--    <if test="unionUser != '' and unionUser!=null">-->
-<!--        and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is-->
+    <!--        and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is-->
-<!--        null) )-->
+    <!--        null) )-->
-<!--    </if>-->
+    <!--    </if>-->
 
     <select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
@@ -346,7 +352,8 @@
                 and invWarehouseCode =#{invWarehouseCode}
             </if>
             <if test="userId!=null">
-                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)
             </if>
 
         </where>
@@ -420,7 +427,8 @@
                 and inv_warehouse_user.userId =#{userId}
             </if>
             <if test="userId != '' and userId!=null">
-                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)
             </if>
 
             <if test="locStorageCode != '' and locStorageCode!=null">
@@ -493,7 +501,8 @@
                 and inv_warehouse_user.userId =#{userId}
             </if>
             <if test="userId != '' and userId!=null">
-                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)
             </if>
 
             <if test="locStorageCode != '' and locStorageCode!=null">

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -30,7 +30,7 @@
                                 thirdSysFk, status, statusInfo, type, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
                                 totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime,
-                                updateTime, invWarehouseCode)
+                                updateTime, invWarehouseCode, fromSubInvCode)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -45,7 +45,7 @@
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
                 #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime},
-                #{updateTime}, #{invWarehouseCode})
+                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -75,7 +75,7 @@
             <if test="auditTime != null">auditTime=#{auditTime},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
-
+            <if test="fromSubInvCode != null">fromSubInvCode=#{fromSubInvCode},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -123,12 +123,14 @@
         inv_prein_product.inCount,inv_prein_product.outCount
         ,inv_prein_product.reCount,inv_prein_product.customerId,
         basic_corp.name companyName,inv_prein_product.supId,inv_prein_product.unitFk ,inv_warehouse.name
-        invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price
+        invStorageName,inv_prein_product.invStorageCode,inv_prein_product.price, inv_warehouse_sub.name
+        invSubStorageName
         FROM inv_prein_product
         inner join basic_udirel on inv_prein_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid
         left join basic_corp on inv_prein_product.supId=basic_corp.erpId
         left join inv_warehouse on inv_warehouse.code=inv_prein_product.invStorageCode
+        left join inv_warehouse_sub on inv_warehouse_sub.parentId = inv_warehouse.code
         <where>
             basic_products.diType=1
             <if test="cpmctymc != '' and cpmctymc != null">
@@ -190,6 +192,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
+        group by inv_prein_product.id
 
     </select>
     <insert id="insertInvProduct" keyProperty="id"
@@ -197,13 +200,13 @@
         insert INTO inv_prein_product
         (productsName, nameCode, relIdFk, ggxh, batchNo,
          productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh,
-         inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode,price)
+         inCount, outCount, reCount, customerId, supId, unitFk, invStorageCode, invWarehouseCode, price)
         values (#{productsName}, #{nameCode},
                 #{relIdFk}, #{ggxh}, #{batchNo},
                 #{productionDate}, #{expireDate},
                 #{ylqxzcrbarmc}, #{zczbhhzbapzbh},
                 #{inCount}, #{outCount}, #{reCount}, #{customerId}, #{supId}, #{unitFk}
-                   , #{invStorageCode}, #{invWarehouseCode},#{price})
+                   , #{invStorageCode}, #{invWarehouseCode}, #{price})
     </insert>
 
 

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
         <where>
             basic_products.diType=1
             <if test="cpmctymc != '' and cpmctymc != null">
@@ -188,7 +189,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
-
+        group by inv_prein_product.id
     </select>
     <insert id="insertInvProduct" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.inventory.InvProductEntity">

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -20,7 +20,7 @@
                 AND inv_product.ggxh like concat('%',#{ggxh},'%')
             </if>
             <if test="batchNo != '' and batchNo != null and batchNo!='empty'">
-                 AND inv_product.batchNo like concat('%',#{batchNo},'%')
+                AND inv_product.batchNo like concat('%',#{batchNo},'%')
             </if>
             <if test="batchNo == 'empty'">
                 AND batchNo is NULL
@@ -104,8 +104,8 @@
     <select id="selectExit" parameterType="Map"
             resultType="com.glxp.sale.admin.entity.inventory.InvProductEntity">
         SELECT *
-        FROM inv_product where relIdFk = #{relIdFk}
+        FROM inv_product
-        limit 1
+        where relIdFk = #{relIdFk} limit 1
     </select>
 
 
@@ -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
         <where>
             basic_products.diType=1
             <if test="productsName != '' and productsName != null">
@@ -182,6 +184,7 @@
         <if test="groupType != '' and groupType != null">
             GROUP BY #{groupType}
         </if>
+        group by inv_product.id
     </select>
 
     <select id="stockStatistics" resultType="com.glxp.sale.admin.res.inventory.InvProductResponse"