切换分支本地暂时提交

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java

@@ -116,6 +116,7 @@ public class StockOrderController {
         stockOrderEntity.setStatus(ConstantStatus.SORDER_DRAFT);//未处理
         stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印
         stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交
+        stockOrderEntity.setInvWarehouseCode(stockOrderPostRequest.getInvWarehouseCode());
 //        stockOrderEntity.setId(String.valueOf(new Date().getTime()));
         stockOrderEntity.setBilldate(DateUtil.formatDate(new Date()));
         boolean b = stockOrderService.insertStockOrder(stockOrderEntity);
@@ -141,6 +142,7 @@ public class StockOrderController {
         Integer userId = customerService.getUserId();
         StockOrderEntity stockOrderEntity = new StockOrderEntity();
         BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity);
+        stockOrderEntity.setInvWarehouseCode(stockOrderPostRequest.getInvWarehouseCode());
         stockOrderEntity.setCreateUser(userId);
         stockOrderEntity.setStatus(
                 StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -751,6 +751,7 @@ public class WareHouseController {
             warehouseEntity.setFromCorp(addOrderRequest.getFromCorp());
             warehouseEntity.setBatchNo(udiEntity.getBatchNo());
             warehouseEntity.setProduceDate(udiEntity.getProduceDate());
+            warehouseEntity.setInvWarehouseCode(addOrderRequest.getInvWarehouseCode());
             warehouseEntity.setNameCode(udiEntity.getUdi());
             warehouseEntity.setExpireDate(udiEntity.getExpireDate());
             warehouseEntity.setSerialNo(udiEntity.getSerialNo());
@@ -815,6 +816,7 @@ public class WareHouseController {
                 orderSaveRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_UN);
                 orderSaveRequest.setSignStatus(ConstantStatus.ORDER_SIGN_UN);
                 orderSaveRequest.setReceiveStatus(ConstantStatus.RECEIVE_UN);
+                orderSaveRequest.setInvWarehouseCode(addOrderRequest.getInvWarehouseCode());
                 orderSaveRequest.setCustomerId(customerId + "");
                 orderService.insertOrder(orderSaveRequest);
             }

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java

@@ -0,0 +1,122 @@
+package com.glxp.sale.admin.controller.inventory;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
+import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.req.info.DeleteRequest;
+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.inventory.InvSubWarehouseService;
+import com.glxp.sale.admin.service.inventory.InvWarehouseService;
+import com.glxp.sale.common.enums.ResultEnum;
+import com.glxp.sale.common.res.BaseResponse;
+import com.glxp.sale.common.util.ResultVOUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+public class InvSubWarehouseController {
+
+    @Resource
+    InvSubWarehouseService invSubWarehouseService;
+    @Resource
+    InvWarehouseService invWarehouseService;
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/sub/inv/warehouse/filter")
+    public BaseResponse filterInvWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        return ResultVOUtils.success(invSubWarehouseEntities);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/sub/inv/warehouse/findByInv")
+    public BaseResponse findByInv(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+
+//        if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) {
+//            return ResultVOUtils.error(500, "用户或仓库不能未空！");
+//        }
+        List<InvSubWarehouseEntity> invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest);
+        return ResultVOUtils.success(invSubWarehouseEntities);
+    }
+
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/sub/inv/warehouse/save")
+    public BaseResponse save(@RequestBody @Valid InvSubWarehouseEntity invSubWarehouseEntity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+
+
+        FilterInvSubWarehouseRequest filterInvWarehouseRequest = new FilterInvSubWarehouseRequest();
+        filterInvWarehouseRequest.setParentId(invSubWarehouseEntity.getParentId());
+        InvSubWarehouseEntity codeEntity = invSubWarehouseService.selectMaxCode(filterInvWarehouseRequest);
+        InvWarehouseEntity pEntity = invWarehouseService.selectByCode(invSubWarehouseEntity.getParentId());
+        if (codeEntity == null) {
+            int code = Integer.parseInt(pEntity.getCode()) * 1000;
+            invSubWarehouseEntity.setCode(code + "");
+        } else {
+            invSubWarehouseEntity.setCode(Integer.parseInt(codeEntity.getCode()) + 1 + "");
+        }
+        invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId());
+        boolean b = invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success("添加成功！");
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/sub/inv/warehouse/edit")
+    public BaseResponse edit(@RequestBody @Valid InvSubWarehouseEntity invSubWarehouseEntity,
+                             BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        if (invSubWarehouseEntity.getId() == 0) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = invSubWarehouseService.updateInvSubWarehouse(invSubWarehouseEntity);
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+
+        return ResultVOUtils.success();
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/spms/sub/inv/warehouse/delete")
+    public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
+
+        if (deleteRequest.getId() == null) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        boolean b = invSubWarehouseService.deleteById(deleteRequest.getId());
+        if (!b) {
+            return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
+        }
+        return ResultVOUtils.success();
+    }
+
+}

api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java

@@ -1,5 +1,7 @@
 package com.glxp.sale.admin.controller.inventory;
 
+import cn.hutool.Hutool;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -12,6 +14,7 @@ import com.glxp.sale.admin.entity.basic.BasicExportStatusEntity;
 import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.sale.admin.entity.inventory.InvProductDetailEntity;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
 import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrInvWarehouseEntity;
@@ -29,6 +32,7 @@ import com.glxp.sale.admin.service.basic.BasicExportService;
 import com.glxp.sale.admin.service.basic.BussinessTypeService;
 import com.glxp.sale.admin.service.inout.WarehouseBussinessTypeService;
 import com.glxp.sale.admin.service.inventory.InvProductDetailService;
+import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.sale.admin.service.inventory.InvWarehouseService;
 import com.glxp.sale.admin.service.param.SystemParamConfigService;
 import com.glxp.sale.admin.service.thrsys.ThrInvWarehouseService;
@@ -57,6 +61,8 @@ public class InvWarehouseController {
     @Resource
     InvWarehouseService invWarehouseService;
     @Resource
+    InvSubWarehouseService invSubWarehouseService;
+    @Resource
     ThrInvWarehouseService thrInvWarehouseService;
     @Resource
     CustomerService customerService;
@@ -216,7 +222,6 @@ public class InvWarehouseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         if (invWarehouseEntity.getPid() == null) {//仓库
             invWarehouseEntity.setPid(0); // 默认设置
             FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
@@ -227,7 +232,6 @@ public class InvWarehouseController {
                 invWarehouseEntity.setPcode("0");
             }
         } else {//货位
-
             FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
             filterInvWarehouseRequest.setPid(invWarehouseEntity.getPid());
             InvWarehouseEntity codeEntity = invWarehouseService.selectMaxCode(filterInvWarehouseRequest);
@@ -244,6 +248,13 @@ public class InvWarehouseController {
         }
         invWarehouseEntity.setUpdateTime(new Date());
         boolean b = invWarehouseService.insertInvWarehouse(invWarehouseEntity);
+        InvSubWarehouseEntity invSubWarehouseEntity = new InvSubWarehouseEntity();
+        invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId());
+        invSubWarehouseEntity.setParentId(invWarehouseEntity.getCode());
+        invSubWarehouseEntity.setName(invWarehouseEntity.getName());
+        invSubWarehouseEntity.setCode(Integer.parseInt(invWarehouseEntity.getCode()) * 1000 + "");
+        invSubWarehouseEntity.setDefaultInv(true);
+        invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity);
         if (!b) {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }

api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvSubWarehouseDao.java

@@ -0,0 +1,29 @@
+package com.glxp.sale.admin.dao.inventory;
+
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
+import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface InvSubWarehouseDao {
+
+    List<InvSubWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
+
+    List<InvSubWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
+
+    InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
+
+    boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity);
+
+    boolean updateInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity);
+
+    void importInvSubWarehouse(@Param("invWarehouseEntities") List<InvSubWarehouseEntity> invSubWarehouseEntities);
+
+    boolean deleteById(String id);
+
+}

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java

@@ -29,6 +29,7 @@ public class StockOrderEntity {
     private String orderIdFk;
     private BigDecimal totalPrice;
     private String locStorageCode;
+    private String invWarehouseCode;
 
     //补单单号
     private String supplementNo;

api-admin/src/main/java/com/glxp/sale/admin/entity/inventory/InvSubWarehouseEntity.java

@@ -0,0 +1,16 @@
+package com.glxp.sale.admin.entity.inventory;
+
+import lombok.Data;
+
+@Data
+public class InvSubWarehouseEntity {
+
+    private long id;
+    private String code;
+    private String name;
+    private String parentId;
+    private String remark;
+    private boolean defaultInv;
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/req/inout/AddOrderRequest.java

@@ -18,6 +18,7 @@ public class AddOrderRequest {
     private String actDate;
     private String billType;
     private String locStorageCode;
+    private String invWarehouseCode;
     private String orderId;
     private String customerId;
     private boolean outChangeEnable;

api-admin/src/main/java/com/glxp/sale/admin/req/inout/FilterOrderRequest.java

@@ -22,6 +22,7 @@ public class FilterOrderRequest {
     private Boolean isLocal;
     private String localAction;
     private String locStorageCode;
+    private String invWarehouseCode;
     //第三方系统ID
     private String thirdSys;
     private Integer editStatus;

api-admin/src/main/java/com/glxp/sale/admin/req/inout/OrderFilterRequest.java

@@ -33,6 +33,7 @@ public class OrderFilterRequest extends ListPageRequest {
 
     private Integer userId;
     private String locStorageCode;
+    private String invWarehouseCode;
     private String lastUpdateTime;
     private Integer unionUser;
     private List<String> filterActions;

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java

@@ -26,6 +26,7 @@ public class StockOrderPostRequest {
     private BigDecimal price;
     private String unitIdFk;
     private Integer editStatus;
+    private String invWarehouseCode;
     private List<StockOrderDetailEntity> subErpOrders;
     private String customerId;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvSubWarehouseRequest.java

@@ -0,0 +1,14 @@
+package com.glxp.sale.admin.req.inventory;
+
+import com.glxp.sale.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterInvSubWarehouseRequest extends ListPageRequest {
+
+    private Integer id;
+    private String code;
+    private String name;
+    private String parentId;
+    private Boolean defaultInv;
+}

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvSubWarehouseService.java

@@ -0,0 +1,26 @@
+package com.glxp.sale.admin.service.inventory;
+
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
+import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
+
+import java.util.List;
+
+public interface InvSubWarehouseService {
+
+    List<InvSubWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
+
+    List<InvSubWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
+
+    InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
+
+    boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity);
+
+    boolean updateInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity);
+
+
+    boolean deleteById(String id);
+
+
+}

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvSubWarehouseServiceImpl.java

@@ -0,0 +1,68 @@
+package com.glxp.sale.admin.service.inventory.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao;
+import com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity;
+import com.glxp.sale.admin.entity.inventory.InvWarehouseEntity;
+import com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest;
+import com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest;
+import com.glxp.sale.admin.service.inventory.InvSubWarehouseService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class InvSubWarehouseServiceImpl implements InvSubWarehouseService {
+
+
+    @Resource
+    InvSubWarehouseDao invSubWarehouseDao;
+
+    @Override
+    public List<InvSubWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
+        if (filterInvSubWarehouseRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvSubWarehouseRequest.getPage() != null) {
+            int offset = (filterInvSubWarehouseRequest.getPage() - 1) * filterInvSubWarehouseRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvSubWarehouseRequest.getLimit());
+        }
+        List<InvSubWarehouseEntity> data = invSubWarehouseDao.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        return data;
+    }
+
+    @Override
+    public List<InvSubWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        if (filterInvWarehouseRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvWarehouseRequest.getPage() != null) {
+            int offset = (filterInvWarehouseRequest.getPage() - 1) * filterInvWarehouseRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvWarehouseRequest.getLimit());
+        }
+        List<InvSubWarehouseEntity> data = invSubWarehouseDao.filterGroupInvSub(filterInvWarehouseRequest);
+        return data;
+    }
+
+    @Override
+    public InvSubWarehouseEntity selectMaxCode(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest) {
+        return invSubWarehouseDao.selectMaxCode(filterInvSubWarehouseRequest);
+    }
+
+    @Override
+    public boolean insertInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity) {
+        return invSubWarehouseDao.insertInvSubWarehouse(invSubWarehouseEntity);
+    }
+
+    @Override
+    public boolean updateInvSubWarehouse(InvSubWarehouseEntity invSubWarehouseEntity) {
+        return invSubWarehouseDao.updateInvSubWarehouse(invSubWarehouseEntity);
+    }
+
+    @Override
+    public boolean deleteById(String id) {
+        return invSubWarehouseDao.deleteById(id);
+    }
+}

api-admin/src/main/java/com/glxp/sale/admin/thread/IoTransInoutService.java

@@ -508,7 +508,7 @@ public class IoTransInoutService {
         if (bussinessTypeEntity.isAdvanceType()) {
             List<InvProductDetailEntity> invPreProductDetailEntitys = invPreProductDetailService.findByOriginCode(warehouseEntity.getCode());
             if (CollUtil.isNotEmpty(invPreProductDetailEntitys)) {
-                InvProductDetailEntity invProductDetailEntity = invPreProductDetailEntitys.get(invPreProductDetailEntitys.size()-1);
+                InvProductDetailEntity invProductDetailEntity = invPreProductDetailEntitys.get(invPreProductDetailEntitys.size() - 1);
                 if (StrUtil.isEmpty(warehouseEntity.getBatchNo())) {
                     warehouseEntity.setBatchNo(invProductDetailEntity.getBatchNo());
                 }
@@ -522,7 +522,7 @@ public class IoTransInoutService {
         } else {
             List<InvProductDetailEntity> invProductDetailEntities = invProductDetailService.findByOriginCode(warehouseEntity.getCode());
             if (CollUtil.isNotEmpty(invProductDetailEntities)) {
-                InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(invProductDetailEntities.size()-1);
+                InvProductDetailEntity invProductDetailEntity = invProductDetailEntities.get(invProductDetailEntities.size() - 1);
                 if (StrUtil.isEmpty(warehouseEntity.getBatchNo())) {
                     warehouseEntity.setBatchNo(invProductDetailEntity.getBatchNo());
                 }
@@ -972,6 +972,7 @@ public class IoTransInoutService {
         }
         stockOrderEntity.setSupplementNo(orderEntity.getSupplementNo());
         stockOrderEntity.setCorpName(orderEntity.getFromCorp());
+        stockOrderEntity.setInvWarehouseCode(orderEntity.getInvWarehouseCode());
         stockOrderEntity.setOrderIdFk(orderEntity.getId());
         stockOrderService.insertStockOrder(stockOrderEntity);
 

api-admin/src/main/resources/application-pro.properties

@@ -36,8 +36,8 @@ logging.file=D:/glxpdata/udiwms/udiwms.log
 file_path=D:/glxpdata/udiwms
 #UDI\u6570\u636E\u4E0B\u8F7D
 UDI_KEY=6b137c66-6286-46c6-8efa-c2f5dd9237df
-#UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
+UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server_test
-UDI_SERVER_URL=http://127.0.0.1:9994
+#UDI_SERVER_URL=http://127.0.0.1:9994
 #UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server
 #UCLOD\u670D\u52A1
 #UCLOD_SERVER_URL=http://127.0.0.1:9997

api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml

@@ -91,8 +91,9 @@
         FROM basic_bustype_local
         inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
         INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
-        INNER JOIN inv_warehouse on inv_warehouse_bussiness_type.`code` = inv_warehouse.`code`
+        INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code
-        INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
+        INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
+        INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` =inv_warehouse_user.`code`
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
         <where>
             <if test="name != ''and name != null">

api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml

@@ -138,8 +138,9 @@
         on basic_bussiness_type.localAction = basic_bustype_local.action
         left join basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
         INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
-        INNER JOIN inv_warehouse on inv_warehouse_bussiness_type.`code` = inv_warehouse.`code`
+        INNER JOIN inv_warehouse_sub on inv_warehouse_sub.`code` = inv_warehouse_bussiness_type.code
-        INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code`
+        INNER JOIN inv_warehouse on inv_warehouse_sub.parentId = inv_warehouse.`code`
+        INNER JOIN inv_warehouse_user on inv_warehouse_sub.`code` =inv_warehouse_user.`code`
         <where>
             <if test="name != ''and name != null">
                 AND basic_bussiness_type.name LIKE concat('%',#{name},'%')

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

@@ -168,6 +168,7 @@
             <if test="fromCorpId != null">fromCorpId=#{fromCorpId},</if>
             <if test="count != null">`count`=#{count},</if>
             <if test="status != null">status=#{status},</if>
+            <if test="serialNo != null">`serialNo`=#{serialNo},</if>
             <if test="supId != null">supId=#{supId},</if>
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>

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

@@ -126,6 +126,7 @@
             <if test="produceDate != null">`produceDate`=#{produceDate},</if>
             <if test="expireDate != null">`expireDate`=#{expireDate},</if>
             <if test="batchNo != null">`batchNo`=#{batchNo},</if>
+            <if test="serialNo != null">`serialNo`=#{serialNo},</if>
             <if test="supId != null">`supId`=#{supId},</if>
             <if test="relId != null">`relId`=#{relId},</if>
         </set>
@@ -145,6 +146,7 @@
             <if test="expireDate != null">`expireDate`=#{expireDate},</if>
             <if test="batchNo != null">`batchNo`=#{batchNo},</if>
             <if test="relId != null">`relId`=#{relId},</if>
+            <if test="serialNo != null">`serialNo`=#{serialNo},</if>
         </set>
         WHERE id=#{id}
     </update>
@@ -160,6 +162,7 @@
             <if test="locStorageCode != null">`locStorageCode`=#{locStorageCode},</if>
             <if test="supId != null">`supId`=#{supId},</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,7 @@
                              fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                              receiveStatus, erpFk, stockCheckFk, customerId, supId,
                              exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                             outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo)
+                             outChangeEnable, originUllageSupNo, preCheck, updateTime, replicateNo, invWarehouseCode)
         values (#{id},
                 #{action},
                 #{corpOrderId},
@@ -52,7 +52,8 @@
                 #{erpFk},
                 #{stockCheckFk},
                 #{customerId}, #{supId}, #{exportFilePath}, #{locStorageCode}, #{supplementNo},
-                #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},#{updateTime}, #{replicateNo})
+                #{ullageSupNo}, #{createUser}, #{reviewUser}, #{outChangeEnable}, #{originUllageSupNo}, #{preCheck},
+                #{updateTime}, #{replicateNo}, #{invWarehouseCode})
     </insert>
 
 
@@ -63,8 +64,9 @@
                               fromCorp, status, remark, exportStatus, fromType, contrastStatus, signStatus,
                               receiveStatus, erpFk, stockCheckFk, customerId, supId,
                               exportFilePath, locStorageCode, supplementNo, ullageSupNo, createUser, reviewUser,
-                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo)
+                              outChangeEnable, originUllageSupNo, preCheck,updateTime,replicateNo,invWarehouseCode)
-        values (#{id},
+        values (
+        #{id},
         #{action},
         #{corpOrderId},
         #{actDate},
@@ -93,7 +95,9 @@
         #{originUllageSupNo},
         #{preCheck},
         #{updateTime},
-                #{replicateNo})
+        #{replicateNo},
+        #{invWarehouseCode}
+        )
     </insert>
 
 
@@ -182,7 +186,9 @@
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT io_order.* FROM io_order
-        INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
+        LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
@@ -206,10 +212,10 @@
                 and exportStatus = #{exportStatus}
             </if>
             <if test="status != '' and status!=null and status!=10">
-                and status = #{status}
+                and io_order.status = #{status}
             </if>
             <if test="status ==10">
-                and ( status = 1 or status=-1)
+                and ( io_order.status = 1 or io_order.status=-1)
             </if>
             <if test="unionCtrStatus != '' and unionCtrStatus!=null">
                 and (contrastStatus = 0 or contrastStatus = 2)
@@ -241,9 +247,7 @@
             <if test="reviewUser!=null">
                 and reviewUser =#{reviewUser}
             </if>
-            <if test="unionUser != '' and unionUser!=null">
+
-                and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is null) )
-            </if>
             <if test="ullageSupNo != '' and ullageSupNo!=null">
                 and ullageSupNo =#{ullageSupNo}
             </if>
@@ -253,16 +257,27 @@
             <if test="locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
+            <if test="invWarehouseCode!=null">
+                and invWarehouseCode =#{invWarehouseCode}
+            </if>
+
         </where>
         group by io_order.id
         ORDER BY actDate DESC
 
     </select>
 
+<!--    <if test="unionUser != '' and unionUser!=null">-->
+<!--        and ((createUser =#{unionUser} or reviewUser =#{unionUser}) or (reviewUser is null and createUser is-->
+<!--        null) )-->
+<!--    </if>-->
+
     <select id="filterList" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT io_order.* FROM io_order
-        INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
+        LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
@@ -276,14 +291,11 @@
             <if test="action != '' and action!=null">
                 and action = #{action}
             </if>
-            <if test="action==null or action == ''">
-                and `action`  <![CDATA[ <> ]]> 'StockCheck'
-            </if>
             <if test="status != '' and status!=null and status!=10">
-                and status = #{status}
+                and io_order.status = #{status}
             </if>
             <if test="status ==10">
-                and ( status = 1 or status=-1)
+                and ( io_order.status = 1 or io_order.status=-1)
             </if>
             <if test="exportStatus != '' and exportStatus!=null">
                 and exportStatus = #{exportStatus}
@@ -315,7 +327,7 @@
             <if test="createUser!=null">
                 and createUser =#{createUser}
             </if>
-            <if test=" reviewUser!=null">
+            <if test="reviewUser!=null">
                 and reviewUser =#{reviewUser}
             </if>
             <if test="ullageSupNo != '' and ullageSupNo!=null">
@@ -327,6 +339,9 @@
             <if test="locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
+            <if test="invWarehouseCode!=null">
+                and invWarehouseCode =#{invWarehouseCode}
+            </if>
         </where>
         group by io_order.id
         ORDER BY actDate DESC
@@ -336,7 +351,9 @@
     <select id="filterListByUser" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT io_order.* FROM io_order
-        INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
+        LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
@@ -354,10 +371,10 @@
                 and `action`  <![CDATA[ <> ]]> 'StockCheck'
             </if>
             <if test="status != '' and status!=null and status!=10">
-                and status = #{status}
+                and io_order.status = #{status}
             </if>
             <if test="status ==10">
-                and ( status = 1 or status=-1)
+                and ( io_order.status = 1 or io_order.status=-1)
             </if>
             <if test="exportStatus != '' and exportStatus!=null">
                 and exportStatus = #{exportStatus}
@@ -398,6 +415,9 @@
             <if test="locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
+            <if test="invWarehouseCode!=null">
+                and invWarehouseCode =#{invWarehouseCode}
+            </if>
         </where>
         group by io_order.id
         ORDER BY actDate DESC
@@ -406,7 +426,9 @@
     <select id="filterNoSort" parameterType="com.glxp.sale.admin.req.inout.OrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.OrderEntity">
         SELECT io_order.* FROM io_order
-        INNER JOIN inv_warehouse_user on io_order.locStorageCode = inv_warehouse_user.`code`
+        LEFT JOIN inv_warehouse ON io_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
                 and io_order.id =#{id}
@@ -421,7 +443,7 @@
                 and `action`  <![CDATA[ <> ]]> 'StockCheck'
             </if>
             <if test="status != '' and status!=null">
-                and status = #{status}
+                and io_order.status = #{status}
             </if>
             <if test="exportStatus != '' and exportStatus!=null">
                 and exportStatus = #{exportStatus}
@@ -462,6 +484,9 @@
             <if test="locStorageCode!=null">
                 and locStorageCode =#{locStorageCode}
             </if>
+            <if test="invWarehouseCode!=null">
+                and invWarehouseCode =#{invWarehouseCode}
+            </if>
         </where>
         group by io_order.id
     </select>
@@ -506,7 +531,8 @@
                 and receiveStatus = #{receiveStatus}
             </if>
             <if test="lastUpdateTime!=null and lastUpdateTime!=''">
-                and   <![CDATA[    DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                and
+                <![CDATA[    DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S')>=  DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
             </if>
             <if test="filterActions!=null">
                 and `action` in
@@ -569,7 +595,7 @@
     </update>
 
     <select id="selectOrderNos" resultType="com.glxp.sale.admin.res.inout.OrderNoResult">
-        select id,supplementNo, originUllageSupNo, ullageSupNo, replicateNo
+        select id, supplementNo, originUllageSupNo, ullageSupNo, replicateNo
         from io_order
         where id = #{id}
     </select>

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

@@ -29,7 +29,7 @@
         insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag,
                                 thirdSysFk, status, statusInfo, type, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
-                                totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd,auditTime,updateTime)
+                                totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd,auditTime,updateTime,invWarehouseCode)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -43,7 +43,7 @@
                 #{type},
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
-                #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd},#{auditTime},#{updateTime})
+                #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd},#{auditTime},#{updateTime},#{invWarehouseCode})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -72,6 +72,7 @@
             <if test="entrustEnd != null">entrustEnd=#{entrustEnd},</if>
             <if test="auditTime != null">auditTime=#{auditTime},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
 
         </trim>
         WHERE id = #{id}
@@ -102,7 +103,9 @@
     <select id="filterListOr" parameterType="com.glxp.sale.admin.req.inout.StockOrderFilterRequest"
             resultType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         SELECT stock_order.* FROM stock_order
-        INNER JOIN inv_warehouse_user on stock_order.locStorageCode = inv_warehouse_user.`code`
+        LEFT  JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
                 and id =#{id}
@@ -129,7 +132,7 @@
                 and thirdSysFk = #{thirdSysFk}
             </if>
             <if test="status != '' and status!=null">
-                and status = #{status}
+                and stock_order.status = #{status}
             </if>
             <if test="statusInfo != '' and statusInfo!=null">
                 and statusInfo = #{statusInfo}
@@ -254,7 +257,9 @@
         stock_order_detail on
         stock_order.id =
         stock_order_detail.orderIdFk
-        left join inv_warehouse on inv_warehouse.code = stock_order.locStorageCode
+        LEFT  JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}

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

@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.sale.admin.dao.inventory.InvSubWarehouseDao">
+
+    <select id="filterInvSubWarehouse" parameterType="com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        select *
+        FROM inv_warehouse_sub a
+        <where>
+            <if test="id != '' and id != null">
+                AND a.id = #{id}
+            </if>
+            <if test="code != '' and code != null">
+                AND a.code = #{code}
+            </if>
+            <if test="name != '' and name != null">
+                AND a.name like concat('%',#{name},'%')
+            </if>
+            <if test="parentId != '' and parentId != null">
+                AND a.parentId = #{parentId}
+            </if>
+            <if test="defaultInv != '' and defaultInv != null">
+                AND a.defaultInv = #{defaultInv}
+            </if>
+
+        </where>
+
+    </select>
+
+    <select id="filterGroupInvSub" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        select inv_warehouse_sub.* from inv_warehouse_sub INNER JOIN inv_warehouse
+        on inv_warehouse_sub.parentId = inv_warehouse.code
+        INNER JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.code
+        <where>
+            <if test="userId != '' and userId != null">
+                AND inv_warehouse_user.userId = #{userId}
+            </if>
+            <if test="pcode != '' and pcode != null">
+                AND inv_warehouse.code = #{pcode}
+            </if>
+        </where>
+        group by inv_warehouse_sub.id
+
+    </select>
+
+
+    <select id="selectMaxCode" parameterType="com.glxp.sale.admin.req.inventory.FilterInvSubWarehouseRequest"
+            resultType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        select max(code) as code from inv_warehouse_sub
+        <where>
+            <if test="id != '' and id != null">
+                AND id = #{id}
+            </if>
+            <if test="code != '' and code != null">
+                AND code = #{code}
+            </if>
+            <if test="name != '' and name != null">
+                AND name = #{name}
+            </if>
+            <if test="parentId != '' and parentId != null">
+                AND parentId = #{parentId}
+            </if>
+        </where>
+
+    </select>
+
+
+    <insert id="insertInvSubWarehouse" keyProperty="id"
+            parameterType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        replace
+        INTO inv_warehouse_sub
+        (id, code, `name`, parentId, remark,defaultInv)
+        values (
+        #{id},
+        #{code},
+        #{name},
+        #{parentId},
+        #{remark},
+        #{defaultInv}
+        )
+    </insert>
+
+
+    <delete id="deleteById" parameterType="Map">
+        DELETE
+        FROM inv_warehouse_sub
+        WHERE id = #{id}
+    </delete>
+
+    <update id="updateInvSubWarehouse" parameterType="com.glxp.sale.admin.entity.inventory.InvSubWarehouseEntity">
+        UPDATE inv_warehouse_sub
+        <trim prefix="set" suffixOverrides=",">
+            <if test="name != null">name=#{name},</if>
+            <if test="code != null">code=#{code},</if>
+            <if test="parentId != null">parentId=#{parentId},</if>
+            <if test="remark != null">remark=#{remark},</if>
+            <if test="defaultInv != null">defaultInv=#{defaultInv},</if>
+        </trim>
+        WHERE id = #{id}
+    </update>
+
+    <insert id="importInvSubWarehouse" parameterType="java.util.List">
+        replace into inv_warehouse_sub
+        (id, code, `name`, parentId, remark,defaultInv)
+        values
+        <foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
+            (
+            #{item.id},
+            #{item.code},
+            #{item.name},
+            #{item.parentId},
+            #{item.remark},#{item.defaultInv})
+        </foreach>
+    </insert>
+
+</mapper>

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

@@ -45,8 +45,9 @@
 
     <select id="filterAllByUser" parameterType="com.glxp.sale.admin.req.inventory.FilterInvWarehouseRequest"
             resultType="com.glxp.sale.admin.entity.inventory.InvWarehouseEntity">
-        select inv_warehouse.* from inv_warehouse INNER JOIN inv_warehouse_user
+        select inv_warehouse.* from inv_warehouse INNER JOIN inv_warehouse_sub
-        on inv_warehouse.`code` =inv_warehouse_user.code
+        on inv_warehouse.`code` =inv_warehouse_sub.parentId
+        INNER JOIN inv_warehouse_user on inv_warehouse_user.`code` = inv_warehouse_sub.code
         <where>
             <if test="id != '' and id != null">
                 AND id = #{id}