bug修改，上架摆货修改

src/main/java/com/glxp/api/constant/Constant.java

@@ -285,5 +285,5 @@ public class Constant {
     public static final String ORDER_ACTION_SUP_INOUT = "supInout";
     public static final String ORDER_ACTION_SUP_PREIN = "preInOrder";
 
-
+    public static final String SYNC_REMARK = "syncRemark";
 }

src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java

@@ -24,6 +24,8 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse;
 import com.glxp.api.service.auth.*;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.system.SystemParamConfigService;
+import com.glxp.api.util.BeanCopyUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.*;
+import java.util.stream.Collectors;
 
 @RestController
 public class InvWarehouseController extends BaseController {
@@ -118,6 +121,38 @@ public class InvWarehouseController extends BaseController {
         return ResultVOUtils.success(list);
     }
 
+
+    /**
+     * 前端查询自己关联仓库包含预验收，寄售库
+     *
+     * @return
+     */
+    @GetMapping("spms/inv/warehouse/findAllInvByUser")
+    public BaseResponse findAllInvByUser(FilterInvWarehouseRequest filterInvWarehouseRequest) {
+        Long userId = getUserId();
+        List<InvWarehouseEntity> list = new ArrayList<>();
+        if (null == userId) {
+            return ResultVOUtils.error(ResultEnum.LOGIN_VERIFY_FALL);
+        }
+        if (filterInvWarehouseRequest.getAdvanceType() == 2 || filterInvWarehouseRequest.getAdvanceType() == 3) {
+            FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+            BeanUtils.copyProperties(filterInvWarehouseRequest, filterInvSubWarehouseRequest);
+            list = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+        } else {
+            FilterInvSubWarehouseRequest filterInvSubWarehouseRequest = new FilterInvSubWarehouseRequest();
+            filterInvSubWarehouseRequest.setFilterAdvanceType(1);
+            List<InvWarehouseEntity> preInList = invWarehouseService.filterInvSubWarehouse(filterInvSubWarehouseRequest);
+            filterInvWarehouseRequest.setUserId(userId);
+            List<InvWarehouseEntity> myList = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);
+            List<InvWarehouseEntity> resultList = myList.stream().filter(invWarehouseEntity ->
+                    preInList.stream().anyMatch(preIn -> !preIn.getCode().equals(invWarehouseEntity.getCode()))
+            ).collect(Collectors.toList());
+            resultList.addAll(preInList);
+            return ResultVOUtils.success(list);
+        }
+        return ResultVOUtils.success(list);
+    }
+
     /**
      * 获取往来仓库(除了自己)
      *
@@ -267,13 +302,16 @@ public class InvWarehouseController extends BaseController {
         if (invWarehouseEntity.getId() == null) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        InvWarehouseEntity originEntity = invWarehouseService.findByInvSubByCode(invWarehouseEntity.getCode());
 
-        Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode());
+        if (!originEntity.getParentId().equals(invWarehouseEntity.getParentId()) || (originEntity.getParentCode() != null && !originEntity.getParentCode().equals(invWarehouseEntity.getParentCode()))) {
-        if (userCount > 0) {
+            Integer userCount = warehouseUserService.countUserBySubInvCode(invWarehouseEntity.getCode());
-            return ResultVOUtils.error(500, "修改失败,请先移除该仓库关联用户！");
+            if (userCount > 0) {
+                return ResultVOUtils.error(500, "修改部门或上级仓库时,请先移除该仓库关联用户！");
+            }
         }
         // 先判断是否有相同名字的仓库
-        boolean checkResult = invWarehouseService.checkDuplicateName(invWarehouseEntity.getParentId(), invWarehouseEntity.getName());
+        boolean checkResult = invWarehouseService.updateCheckExit(invWarehouseEntity);
         if (checkResult) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "仓库名称重复！");
         }

src/main/java/com/glxp/api/controller/auth/SysUserController.java

@@ -71,24 +71,24 @@ public class SysUserController extends BaseController {
             AuthAdminResponse authAdminResponse = new AuthAdminResponse();
             BeanUtils.copyProperties(item, authAdminResponse);
             List<Long> roles = sysRoleService.selectRoleListByUserId(authAdminResponse.getId());
-            List<DeptUserResponse> deptUserResponses = null;
+            List<DeptUserResponse> deptUserResponses=null;
-            if ("key".equals(filterAuthUserRequest.getKey())) {
+            if("key".equals(filterAuthUserRequest.getKey())){
-                deptUserResponses = deptUserService.selectByUserIdKey(authAdminResponse.getId());
+                deptUserResponses   = deptUserService.selectByUserIdKey(authAdminResponse.getId());
-            } else {
+            }else{
                 deptUserResponses = deptUserService.selectByUserId(authAdminResponse.getId());
             }
             if (CollUtil.isNotEmpty(deptUserResponses)) {
                 List<Long> depts = new ArrayList<>();
                 String deptName = "";
                 for (DeptUserResponse deptUserResponse : deptUserResponses) {
-                    if (deptUserResponse.getDeptId() != 1) {
+                    if(deptUserResponse.getDeptId()!=1){
                         depts.add(deptUserResponse.getDeptId());
                         deptName = deptName + "," + deptUserResponse.getDeptName();
                     }
                 }
-                if (deptName.length() != 0) {
+                if(deptName.length()!=0){
                     authAdminResponse.setDeptName(deptName.substring(1));
-                } else {
+                }else{
                     authAdminResponse.setDeptName(deptName);
                 }
                 authAdminResponse.setDepts(depts);
@@ -190,9 +190,9 @@ public class SysUserController extends BaseController {
         }
 
         //默认插入第一部门
-        List<Long> deptCodeList = authUserSaveRequest.getDepts();
+        List<Long> deptCodeList=authUserSaveRequest.getDepts();
-        if (deptCodeList == null) {
+        if(deptCodeList == null){
-            deptCodeList = new ArrayList<>();
+            deptCodeList=new ArrayList<>();
         }
         deptCodeList.add(1L);
         authUserSaveRequest.setDepts(deptCodeList);
@@ -261,7 +261,7 @@ public class SysUserController extends BaseController {
             return ResultVOUtils.error(ResultEnum.NOT_NETWORK);
         }
         // 修改角色
-        // userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
+       // userService.insertUserAuth(authAdmin.getId(), authUserSaveRequest.getRoles());
 
         userService.updateAuthAdmin(authAdmin);
 
@@ -270,9 +270,12 @@ public class SysUserController extends BaseController {
         FilterDeptUserReqeust filterDeptUserReqeust = new FilterDeptUserReqeust();
         filterDeptUserReqeust.setUserId(authUserSaveRequest.getId());
         List<DeptUserEntity> deptUserEntities = deptUserService.selectDeptUser(filterDeptUserReqeust);
-        if (deptUserEntities == null) {
+        if(deptUserEntities == null){
             deptCodeList.add(1L);
-            authUserSaveRequest.setDepts(deptCodeList);
+            if (CollUtil.isEmpty(authUserSaveRequest.getDepts()))
+                authUserSaveRequest.setDepts(deptCodeList);
+            else
+                authUserSaveRequest.getDepts().addAll(deptCodeList);
         } else {
             Boolean checkDeptId = false;
             for (DeptUserEntity deptUserEntity : deptUserEntities) {
@@ -284,7 +287,10 @@ public class SysUserController extends BaseController {
             }
             if (checkDeptId == false) {
                 deptCodeList.add(1L);
-                authUserSaveRequest.setDepts(deptCodeList);
+                if (CollUtil.isEmpty(authUserSaveRequest.getDepts()))
+                    authUserSaveRequest.setDepts(deptCodeList);
+                else
+                    authUserSaveRequest.getDepts().addAll(deptCodeList);
             }
         }
 

src/main/java/com/glxp/api/controller/basic/BasicBusTypeChangeController.java

@@ -66,7 +66,7 @@ public class BasicBusTypeChangeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        boolean result = basicBusTypeChangeService.verifyExists(basicBusTypeChangeEntity);
+        boolean result = basicBusTypeChangeService.insertVerifyExists(basicBusTypeChangeEntity);
         if (result) {
             return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "重复添加");
         }

src/main/java/com/glxp/api/controller/inout/ioCodeRelController.java

@@ -57,6 +57,9 @@ public class ioCodeRelController {
 
         if (StrUtil.isNotEmpty(code)) {
             UdiEntity udiEntity = FilterUdiUtils.getGS1Udi(code);
+            if (udiEntity == null) {
+                return ResultVOUtils.error(500, "UDI码格式错误！");
+            }
             UdiProductEntity udiProductEntity = udiProductService.findByNameCode(udiEntity.getUdi());
             if (udiProductEntity.getPackLevel() != null) {
                 if (Integer.valueOf(udiProductEntity.getPackLevel()) > 1) {

src/main/java/com/glxp/api/controller/inv/InvPlaceController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.inv;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.common.enums.ResultEnum;
@@ -51,8 +52,22 @@ public class InvPlaceController {
         if (null == bindInvSpaceRequest) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        invPlaceService.bindInvSpace(bindInvSpaceRequest);
+        return invPlaceService.bindInvSpace(bindInvSpaceRequest);
-        return ResultVOUtils.success("绑定成功");
+    }
+
+
+    /**
+     * 更换货位接口
+     *
+     * @param bindInvSpaceRequest
+     * @return
+     */
+    @PostMapping("/spms/inv/product/changeInvSpace")
+    public BaseResponse changeInvSpace(@RequestBody @Valid BindInvSpaceRequest bindInvSpaceRequest) {
+        if (null == bindInvSpaceRequest) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+        }
+        return invPlaceService.bindInvSpace(bindInvSpaceRequest);
     }
 
     /**
@@ -78,6 +93,8 @@ public class InvPlaceController {
     @GetMapping("/spms/inv/product/getInvProductInfo")
     private BaseResponse getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) {
         List<InvPlaceDetailResponse> list = invPlaceService.getInvProductInfo(filterInvPlaceRequest);
+        if (CollUtil.isEmpty(list))
+            return ResultVOUtils.error(500, "库存未找到产品信息！");
         return ResultVOUtils.success(list);
     }
 

src/main/java/com/glxp/api/controller/inv/InvProductController.java

@@ -74,8 +74,14 @@ public class InvProductController extends BaseController {
                 filterInvProductRequest.setInvCodes(invCodes);
             }
         }
+        List<InvProductResponse> list;
+        if (StrUtil.isNotEmpty(filterInvProductRequest.getInvSpaceCode())) {
+            list = invProductService.findGroupBySpace(filterInvProductRequest);
+        } else {
+            list = invProductService.filterListProduct(filterInvProductRequest);
+        }
+
 
-        List<InvProductResponse> list = invProductService.filterListProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo = new PageInfo<>(list);
         InvProductPageResponse<InvProductResponse> pageResponse = new InvProductPageResponse();
         pageResponse.setList(pageInfo.getList());

src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.sync.BasicDownloadStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusEntity;
 import com.glxp.api.entity.sync.BasicExportStatusTimeEntity;
 import com.glxp.api.http.sync.SpGetHttpClient;
@@ -13,10 +14,13 @@ import com.glxp.api.req.sync.BasicExportStatusRequest;
 import com.glxp.api.req.sync.BasicExportTimeRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.service.sync.BasicDownloadService;
 import com.glxp.api.service.sync.BasicExportService;
 import com.glxp.api.service.sync.BasicExportTimeService;
+import com.glxp.api.util.BeanCopyUtils;
 import com.glxp.api.util.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,6 +45,8 @@ public class SpsSyncExportStatusController {
     @Resource
     BasicExportService basicExportService;
     @Resource
+    BasicDownloadService basicDownloadService;
+    @Resource
     BasicExportTimeService basicExportTimeService;
     @Resource
     RedisUtil redisUtil;
@@ -125,7 +131,14 @@ public class SpsSyncExportStatusController {
         if (StrUtil.isBlank(deleteRequest.getId())) {
             throw new RuntimeException("缺少唯一标识");
         }
-        BasicExportStatusEntity info = basicExportService.getById(deleteRequest.getId());
+        BasicExportStatusEntity info = new BasicExportStatusEntity();
+        if (deleteRequest.getDlType() != null && deleteRequest.getDlType() == 1) {
+            info = basicExportService.getById(deleteRequest.getId());
+        } else {
+            BasicDownloadStatusEntity basicDownloadStatusEntity = basicDownloadService.getById(deleteRequest.getId());
+            BeanUtils.copyProperties(basicDownloadStatusEntity, info);
+        }
+
         if (info == null) {
             throw new RuntimeException("数据不存在");
         }

src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java

@@ -2,9 +2,15 @@ package com.glxp.api.dao.inv;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
+import com.glxp.api.req.inv.FilterInvPlaceRequest;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
+import com.glxp.api.req.inv.FilterInvPreinProductRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
+import com.glxp.api.res.inv.InvPlaceDetailResponse;
+import com.glxp.api.res.inv.InvPreinProductResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,6 +28,8 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus<InvPreInProduct
      */
     List<InvPreInProductDetailEntity> filterPreProductDetailList(FilterInvPreProductDetailRequest filterInvPreProductDetailRequest);
 
+    List<InvPreinProductResponse> findGroupBySpace(FilterInvPreinProductRequest filterInvPreinProductRequest);
+
     /**
      * 删除寄预验收库存详情
      *
@@ -29,4 +37,11 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus<InvPreInProduct
      * @return
      */
     boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
+
+    List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
+
+    void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
+
+    List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
+
 }

src/main/java/com/glxp/api/dao/inv/InvPreProductDao.java

@@ -2,8 +2,11 @@ package com.glxp.api.dao.inv;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.InvPreProductEntity;
+import com.glxp.api.req.inv.FilterInvPlaceRequest;
 import com.glxp.api.req.inv.FilterInvPreProductRequest;
+import com.glxp.api.res.inv.InvPlaceDetailResponse;
 import com.glxp.api.res.inv.InvPreProductResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,6 +23,8 @@ public interface InvPreProductDao extends BaseMapperPlus<InvPreProductDao, InvPr
      */
     List<InvPreProductResponse> filterList(FilterInvPreProductRequest invPreProductRequest);
 
+
+
     /**
      * 查询寄售库存实体列表
      *
@@ -28,4 +33,5 @@ public interface InvPreProductDao extends BaseMapperPlus<InvPreProductDao, InvPr
      */
     List<InvPreProductEntity> filterPreProductList(FilterInvPreProductRequest invPreProductRequest);
 
-}
+
+}

src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java

@@ -2,8 +2,14 @@ package com.glxp.api.dao.inv;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.InvPreProductDetailEntity;
+import com.glxp.api.req.inv.FilterInvPlaceRequest;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
+import com.glxp.api.req.inv.FilterInvPreinProductRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.res.inout.IoOrderResponse;
+import com.glxp.api.res.inv.InvPlaceDetailResponse;
+import com.glxp.api.res.inv.InvPreinProductResponse;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -12,6 +18,9 @@ import java.util.List;
  */
 public interface InvPreProductDetailDao extends BaseMapperPlus<InvPreProductDetailDao, InvPreProductDetailEntity, InvPreProductDetailEntity> {
 
+
+    List<InvPreinProductResponse> findGroupBySpace(FilterInvPreinProductRequest filterInvPreinProductRequest);
+
     /**
      * 查询库存详情实体列表
      *
@@ -27,4 +36,11 @@ public interface InvPreProductDetailDao extends BaseMapperPlus<InvPreProductDeta
      * @return
      */
     boolean deleteInvPreProductDetail(FilterInvProductDetailRequest detailRequest);
-}
+
+    List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest);
+
+
+    void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
+
+    List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
+}

src/main/java/com/glxp/api/dao/inv/InvPreinProductDao.java

@@ -5,6 +5,7 @@ import com.glxp.api.entity.inv.InvPreinProductEntity;
 import com.glxp.api.req.inv.FilterInvPreinProductRequest;
 import com.glxp.api.res.inv.InvPreinProductResponse;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -22,6 +23,8 @@ public interface InvPreinProductDao extends BaseMapperPlus<InvPreinProductDao, I
      */
     List<InvPreinProductResponse> filterList(FilterInvPreinProductRequest invPreProductRequest);
 
+    void batchBindSpace(@Param("ids") List<Integer> ids, @Param("invSpaceCode") String invSpaceCode);
+
     /**
      * 查询寄售库存实体列表
      *

src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java

@@ -3,10 +3,14 @@ package com.glxp.api.dao.inv;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvPlaceRequest;
+import com.glxp.api.req.inv.FilterInvPreinProductRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
+import com.glxp.api.req.inv.FilterInvProductRequest;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inv.BindInvSpaceRequest;
 import com.glxp.api.res.inv.InvPlaceDetailResponse;
+import com.glxp.api.res.inv.InvPreinProductResponse;
+import com.glxp.api.res.inv.InvProductResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -23,6 +27,9 @@ public interface InvProductDetailDao extends BaseMapperPlus<InvProductDetailDao,
      */
     List<InvProductDetailEntity> filterInvProductDetailList(FilterInvProductDetailRequest filterInvProductDetailRequest);
 
+
+    List<InvProductResponse> findGroupBySpace(FilterInvProductRequest filterInvProductRequest);
+
     /**
      * 删除库存详情
      *

src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java

@@ -34,7 +34,7 @@ public class BasicExportStatusEntity {
     private Date endTime;
     private String remark;
     @TableField(value = "receiveStatus")
-    private Integer receiveStatus;
+    private String receiveStatus;
     @TableField(value = "cacheFilePath")
     private String cacheFilePath;
 

src/main/java/com/glxp/api/entity/system/SyncDataBustypeEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @TableName(value = "sync_data_bustypes")
 public class SyncDataBustypeEntity {
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
     @TableField(value = "`action`")
     private String action;
     @TableField(value = "`name`")

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -214,10 +214,10 @@ public class SpGetHttpClient {
     }
 
 
-    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
+    public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type,String status) {
         Map<String, String> paramMap = new HashMap<>(16);
         paramMap.put("type", type);
-        paramMap.put("status", "1");
+        paramMap.put("status", status);
         String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap, buildHeader());
         try {
             BaseResponse<List<BasicExportStatusEntity>> data =

src/main/java/com/glxp/api/req/auth/FilterInvSubWarehouseRequest.java

@@ -20,4 +20,5 @@ public class FilterInvSubWarehouseRequest extends ListPageRequest {
     public String thirdId4;
 
     private String key;
+    private Integer filterAdvanceType;
 }

src/main/java/com/glxp/api/req/auth/FilterInvWarehouseRequest.java

@@ -14,6 +14,7 @@ public class FilterInvWarehouseRequest extends ListPageRequest {
     private String code;
     private String name;
     private String deptCode;
+    //     1:入账库，2：预验收库，3：寄售库
     private Integer advanceType;
     private Boolean isDefault;
     private Date updateTime;

src/main/java/com/glxp/api/req/inv/FilterInvPreinProductRequest.java

@@ -88,6 +88,11 @@ public class FilterInvPreinProductRequest extends ListPageRequest {
      */
     private String invCode;
 
+
+    //  货位编码
+    private String spaceCode;
+
+
     /**
      * 仓库数组
      */

src/main/java/com/glxp/api/req/system/DeleteRequest.java

@@ -11,4 +11,5 @@ public class DeleteRequest {
     List<String> ids;
     String billNo;
     List<String> billNos;
+    Integer dlType;     //1:同步任务，2：下载记录
 }

src/main/java/com/glxp/api/res/inv/BindInvSpaceRequest.java

@@ -50,4 +50,7 @@ public class BindInvSpaceRequest {
      */
     private String orderId;
 
+
+    private String changeSpaceCode;
+
 }

src/main/java/com/glxp/api/res/inv/InvPreProductDetailResponse.java

@@ -127,4 +127,6 @@ public class InvPreProductDetailResponse {
      */
     private String orderTime;
 
+    private String invSpaceName;
+
 }

src/main/java/com/glxp/api/res/inv/InvProductDetailResponse.java

@@ -126,4 +126,7 @@ public class InvProductDetailResponse {
      * 单据日期
      */
     private String orderTime;
+
+
+    private String invSpaceName;
 }

src/main/java/com/glxp/api/res/inv/InvProductResponse.java

@@ -95,6 +95,9 @@ public class InvProductResponse {
      */
     private String invName;
 
+    //    货位名称
+    private String spaceName;
+
     /**
      * 部门编码
      */

src/main/java/com/glxp/api/res/sync/BaseSyncResponse.java

@@ -13,4 +13,5 @@ public class BaseSyncResponse {
     private String updateTime;
     private String type;
     private String idDatas;
+    private String syncRemark;
 }

src/main/java/com/glxp/api/res/system/SystemPDFTemplateRelevanceResponse.java

@@ -2,6 +2,8 @@ package com.glxp.api.res.system;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class SystemPDFTemplateRelevanceResponse {
 
@@ -22,5 +24,6 @@ public class SystemPDFTemplateRelevanceResponse {
     private String remark2;
     private String remark3;
     private int printType;
+    private Date updateTime;
 
 }

src/main/java/com/glxp/api/service/auth/InvSpaceService.java

@@ -18,6 +18,8 @@ public interface InvSpaceService extends IService<InvSpace> {
      */
     List<InvSpaceResponse> filterList(FilterInvSpaceRequest filterInvSpaceRequest);
 
+    InvSpace findByCode(String invCode, String spaceCode);
+
     /**
      * 添加货位
      *

src/main/java/com/glxp/api/service/auth/InvWarehouseService.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 public interface InvWarehouseService extends IService<InvWarehouseEntity> {
 
-    InvWarehouseEntity getByWareId( String id);
+    InvWarehouseEntity getByWareId(String id);
 
     List<InvWarehouseEntity> getByWarePcode(@Param("parentCode") String parentCode);
 
@@ -21,7 +21,6 @@ public interface InvWarehouseService extends IService<InvWarehouseEntity> {
 
     InvWarehouseEntity selectByThrCode(String code, String thirdSys);
 
-
     List<InvWarehouseEntity> filterInvSubWarehouse(FilterInvSubWarehouseRequest filterInvSubWarehouseRequest);
 
     List<InvWarehouseEntity> filterGroupInvSub(FilterInvWarehouseRequest filterInvSubWarehouseRequest);
@@ -42,6 +41,8 @@ public interface InvWarehouseService extends IService<InvWarehouseEntity> {
 
     public boolean checkDuplicateName(String parentId, String name);
 
+    boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity);
+
     /**
      * 根据分库编码，查询分库名称
      *

src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java

@@ -3,6 +3,7 @@ package com.glxp.api.service.auth.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.enums.ResultEnum;
@@ -45,6 +46,17 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
         return invSpaceDao.filterList(filterInvSpaceRequest);
     }
 
+    @Override
+    public InvSpace findByCode(String invCode, String spaceCode) {
+        if (StrUtil.isEmpty(invCode) || StrUtil.isEmpty(spaceCode))
+            return null;
+        List<InvSpace> invSpaces = invSpaceDao.selectList(new QueryWrapper<InvSpace>()
+                .eq("invWarehouseCode", invCode).eq("code", spaceCode).last("limit 1"));
+        if (CollUtil.isNotEmpty(invSpaces))
+            return invSpaces.get(0);
+        return null;
+    }
+
     @Override
     public BaseResponse addSpace(InvSpace invSpace) {
         BaseResponse verifyResult = verifySpaceParams(invSpace);
@@ -57,7 +69,7 @@ public class InvSpaceServiceImpl extends ServiceImpl<InvSpaceDao, InvSpace> impl
         }
 
         //获取当前仓库下的最大货位编码
-        String maxSpaceCode = invSpaceDao.getMaxSpaceCode(invSpace.getInvWarehouseCode());
+        String maxSpaceCode = invSpaceDao.getMaxSpaceCode(null);
         if (StrUtil.isBlank(maxSpaceCode)) {
             maxSpaceCode = "0000";
         }

src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java

@@ -149,6 +149,12 @@ public class InvWarehouseServiceImpl extends ServiceImpl<InvWarehouseDao, InvWar
         return false;
     }
 
+    @Override
+    public boolean updateCheckExit(InvWarehouseEntity invWarehouseEntity) {
+        return invWarehouseDao.exists(new QueryWrapper<InvWarehouseEntity>().eq("parentId", invWarehouseEntity.getParentId())
+                .eq("name", invWarehouseEntity.getName()).ne("id", invWarehouseEntity.getId()));
+    }
+
     @Override
     public String getSubInvName(String subInvCode) {
         if (StrUtil.isBlank(subInvCode)) {

src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java

@@ -56,4 +56,8 @@ public interface IBasicBusTypeChangeService extends IService<BasicBusTypeChangeE
 
 
     List<BasicBusTypeChangeEntity> findByLastTime(Date lastUpdateTime);
+
+    boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity);
+
+
 }

src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class BasicBusTypeChangeServiceImpl extends ServiceImpl<BasicBusTypeChangeDao,BasicBusTypeChangeEntity> implements IBasicBusTypeChangeService {
+public class BasicBusTypeChangeServiceImpl extends ServiceImpl<BasicBusTypeChangeDao, BasicBusTypeChangeEntity> implements IBasicBusTypeChangeService {
 
     @Resource
     private CustomerService customerService;
@@ -64,23 +64,21 @@ public class BasicBusTypeChangeServiceImpl extends ServiceImpl<BasicBusTypeChang
 
     @Override
     public boolean verifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
+        QueryWrapper<BasicBusTypeChangeEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction())
+                .eq("targetAction", basicBusTypeChangeEntity.getTargetAction())
+                .eq("originName", basicBusTypeChangeEntity.getOriginName()).ne("id", basicBusTypeChangeEntity.getId());
+        return basicBusTypeChangeDao.exists(wrapper);
+    }
+
+
+    @Override
+    public boolean insertVerifyExists(BasicBusTypeChangeEntity basicBusTypeChangeEntity) {
         QueryWrapper<BasicBusTypeChangeEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("originAction", basicBusTypeChangeEntity.getOriginAction())
                 .eq("targetAction", basicBusTypeChangeEntity.getTargetAction())
                 .eq("originName", basicBusTypeChangeEntity.getOriginName());
-        List<BasicBusTypeChangeEntity> list = basicBusTypeChangeDao.selectList(wrapper);
+        return basicBusTypeChangeDao.exists(wrapper);
-        if (CollUtil.isNotEmpty(list)) {
-            if (null != basicBusTypeChangeEntity.getId()) {
-                for (BasicBusTypeChangeEntity busTypeChangeEntity : list) {
-                    if (busTypeChangeEntity.getId() != basicBusTypeChangeEntity.getId()) {
-                        return true;
-                    }
-                }
-            } else {
-                return true;
-            }
-        }
-        return false;
     }
 
     @Override

src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java

@@ -197,15 +197,15 @@ public class IoChangeInoutService {
                 outOrder.setFromCorp(corpName);
                 outOrder.setFromInvCode(null);
                 outOrder.setFromDeptCode(null);
-            } else if (bussinessChangeTypeEntity.getCreateType() == 3) {    //寄售、预验收补单
+            } else if (bussinessChangeTypeEntity.getCreateType() == 3) {    //预验收转入库单模式
-                outOrder.setCustomerId(null);
+                outOrder.setCustomerId(corpName);
-                outOrder.setFromCorp(null);
+                outOrder.setFromCorp(corpName);
                 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE);
                 outOrder.setFromInvCode(invWarehouseEntity.getCode());
                 outOrder.setFromDeptCode(invWarehouseEntity.getParentId());
-            } else if (bussinessChangeTypeEntity.getCreateType() == 4) {
+            } else if (bussinessChangeTypeEntity.getCreateType() == 4) {        //寄售转入库单模式
-                outOrder.setCustomerId(null);
+                outOrder.setCustomerId(corpName);
-                outOrder.setFromCorp(null);
+                outOrder.setFromCorp(corpName);
                 InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_CODE);
                 outOrder.setFromInvCode(invWarehouseEntity.getCode());
                 outOrder.setFromDeptCode(invWarehouseEntity.getParentId());

src/main/java/com/glxp/api/service/inv/InvPlaceService.java

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inv;
 
 import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.req.inv.FilterInvPlaceRequest;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inv.BindInvSpaceRequest;
@@ -26,7 +27,16 @@ public interface InvPlaceService {
      *
      * @param bindInvSpaceRequest
      */
-    void bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
+    BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
+
+
+    /**
+     * 更换货位
+     *
+     * @param bindInvSpaceRequest
+     */
+    BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest);
+
 
     /**
      * 校验库存详情绑定货位信息

src/main/java/com/glxp/api/service/inv/InvProductService.java

@@ -33,6 +33,8 @@ public interface InvProductService {
      */
     List<InvProductResponse> filterListProduct(FilterInvProductRequest filterInvProductRequest);
 
+    List<InvProductResponse> findGroupBySpace(FilterInvProductRequest filterInvProductRequest);
+
     /**
      * 根据ID查询库存
      *

src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.inv.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -92,6 +93,8 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
         invInnerOrderPrintDao.delete(ew);
 
         List<InnerOrderDetailEntity> innerOrderDetailEntityList = innerOrderDetailService.selectOrderList(orderIdFk);
+        if (CollUtil.isEmpty(innerOrderDetailEntityList))
+            return false;
 
         for (InnerOrderDetailEntity obj : innerOrderDetailEntityList) {
             InvInnerOrderPrintEntity innerOrderPrintEntity = new InvInnerOrderPrintEntity();

src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java

@@ -7,9 +7,16 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.auth.InvSpaceDao;
 import com.glxp.api.dao.auth.InvWarehouseDao;
+import com.glxp.api.dao.inv.InvPreInProductDetailDao;
+import com.glxp.api.dao.inv.InvPreProductDetailDao;
 import com.glxp.api.dao.inv.InvProductDetailDao;
+import com.glxp.api.entity.auth.InvSpace;
+import com.glxp.api.entity.auth.InvWarehouseEntity;
+import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
+import com.glxp.api.entity.inv.InvPreProductDetailEntity;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.req.inv.AddInvPlaceOrderRequest;
 import com.glxp.api.req.inv.FilterInvPlaceRequest;
@@ -18,11 +25,14 @@ import com.glxp.api.res.inv.BindInvSpaceRequest;
 import com.glxp.api.res.inv.InvPlaceDetailResponse;
 import com.glxp.api.service.inv.InvPlaceOrderService;
 import com.glxp.api.service.inv.InvPlaceService;
+import com.glxp.api.util.BeanCopyUtils;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -35,6 +45,10 @@ public class InvPlaceServiceImpl implements InvPlaceService {
     @Resource
     private InvProductDetailDao invProductDetailDao;
     @Resource
+    private InvPreProductDetailDao invPreProductDetailDao;
+    @Resource
+    private InvPreInProductDetailDao invPreInProductDetailDao;
+    @Resource
     private InvWarehouseDao invWarehouseDao;
     @Resource
     private InvSpaceDao invSpaceDao;
@@ -52,20 +66,62 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         return invProductDetailDao.selectPlaceDetailList(filterInvPlaceRequest);
     }
 
+
     @Override
-    public void bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
+    public BaseResponse bindInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
         //查询仓库的部门ID
         String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
-        List<InvProductDetailEntity> list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
-                .select("id", "code", "relId", "batchNo")
+
-                .eq("deptCode", deptCode)
+        List<InvProductDetailEntity> list = new ArrayList<>();
-                .eq("invCode", bindInvSpaceRequest.getInvCode())
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
-                .in("code", bindInvSpaceRequest.getCodeArray())
+            List<InvPreInProductDetailEntity> invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>()
-        );
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+            for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) {
+                InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
+                list.add(invProductDetailEntity);
+            }
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+
+            List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+            for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) {
+                InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
+                list.add(invProductDetailEntity);
+            }
+
+        } else {
+            list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+        }
+
         if (CollUtil.isNotEmpty(list)) {
             List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
             log.info("本次绑定货位的库存详情数量为：{} 条", ids.size());
-            invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
+
+
+            if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+                invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
+            } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+                invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
+            } else {
+                invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getInvSpaceCode());
+            }
+
 
             //添加物资上架记录
             AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
@@ -75,8 +131,83 @@ public class InvPlaceServiceImpl implements InvPlaceService {
             addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
             addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
             invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
+            return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条");
         } else {
             log.info("绑定货位列表查询无数据");
+            return ResultVOUtils.error(500, "绑定货位列表查询无数据");
+        }
+    }
+
+    @Override
+    public BaseResponse changeInvSpace(BindInvSpaceRequest bindInvSpaceRequest) {
+        //查询仓库的部门ID
+        String deptCode = invWarehouseDao.selectParentIdByCode(bindInvSpaceRequest.getInvCode());
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.filterGroupInvSubAndcode(bindInvSpaceRequest.getInvCode());
+
+        List<InvProductDetailEntity> list = new ArrayList<>();
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+            List<InvPreInProductDetailEntity> invPreInProductDetailEntities = invPreInProductDetailDao.selectList(new QueryWrapper<InvPreInProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+            for (InvPreInProductDetailEntity invPreInProductDetailEntity : invPreInProductDetailEntities) {
+                InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
+                list.add(invProductDetailEntity);
+            }
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+
+            List<InvPreProductDetailEntity> invPreProductDetailEntities = invPreProductDetailDao.selectList(new QueryWrapper<InvPreProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+            for (InvPreProductDetailEntity invPreInProductDetailEntity : invPreProductDetailEntities) {
+                InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
+                BeanCopyUtils.copy(invPreInProductDetailEntity, invProductDetailEntity);
+                list.add(invProductDetailEntity);
+            }
+
+        } else {
+            list = invProductDetailDao.selectList(new QueryWrapper<InvProductDetailEntity>()
+                    .select("id", "code", "relId", "batchNo")
+                    .eq("deptCode", deptCode)
+                    .eq("invCode", bindInvSpaceRequest.getInvCode())
+                    .eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode())
+                    .in("code", bindInvSpaceRequest.getCodeArray())
+            );
+        }
+
+        if (CollUtil.isNotEmpty(list)) {
+            List<Integer> ids = list.stream().map(InvProductDetailEntity::getId).collect(Collectors.toList());
+            log.info("本次更换货位的库存详情数量为：{} 条", ids.size());
+
+            if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+                invPreInProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
+            } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+                invPreProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
+            } else {
+                invProductDetailDao.batchBindSpace(ids, bindInvSpaceRequest.getChangeSpaceCode());
+            }
+
+
+            //添加物资上架记录
+            AddInvPlaceOrderRequest addInvPlaceOrderRequest = new AddInvPlaceOrderRequest();
+            addInvPlaceOrderRequest.setType(bindInvSpaceRequest.getType());
+            addInvPlaceOrderRequest.setOrderId(bindInvSpaceRequest.getOrderId());
+            addInvPlaceOrderRequest.setCodeList(list);
+            addInvPlaceOrderRequest.setInvCode(bindInvSpaceRequest.getInvCode());
+            addInvPlaceOrderRequest.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
+            invPlaceOrderService.addInvPlaceOrder(addInvPlaceOrderRequest);
+            return ResultVOUtils.success("绑定成功！本次绑定货位的库存详情数量为：" + ids.size() + "条");
+        } else {
+            log.info("绑定货位列表查询无数据");
+            return ResultVOUtils.error(500, "绑定货位列表查询无数据");
         }
     }
 
@@ -99,7 +230,15 @@ public class InvPlaceServiceImpl implements InvPlaceService {
 
     @Override
     public List<InvPlaceDetailResponse> getInvProductInfo(FilterInvPlaceRequest filterInvPlaceRequest) {
-        return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
+
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", filterInvPlaceRequest.getInvCode()));
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+            return invPreInProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+            return invPreProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
+        } else
+            return invProductDetailDao.getInvProductInfo(filterInvPlaceRequest);
+
     }
 
     @Override
@@ -110,6 +249,16 @@ public class InvPlaceServiceImpl implements InvPlaceService {
         if (null != filterInvPlaceRequest.getPage() && null != filterInvPlaceRequest.getLimit()) {
             PageHelper.offsetPage((filterInvPlaceRequest.getPage() - 1) * filterInvPlaceRequest.getLimit(), filterInvPlaceRequest.getLimit());
         }
-        return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
+
+
+        InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", filterInvPlaceRequest.getInvCode()));
+        if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
+            return invPreInProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
+        } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
+            return invPreProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
+        } else
+            return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
+
+
     }
 }

src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java

@@ -11,6 +11,7 @@ import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inv.InvPreInProductDetailDao;
 import com.glxp.api.dao.inv.InvPreProductDetailDao;
+import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
@@ -18,6 +19,7 @@ import com.glxp.api.entity.inv.InvPreinDetailEntity;
 import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.res.inv.InvPreProductDetailResponse;
+import com.glxp.api.service.auth.InvSpaceService;
 import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.service.inv.InvPreinProductDetailService;
 import com.glxp.api.util.DateUtil;
@@ -115,6 +117,9 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
         return invPreInProductDetailDao.filterPreProductDetailList(invPreProductDetailRequest);
     }
 
+    @Resource
+    InvSpaceService invSpaceService;
+
     @Override
     public void setOrderInfo(InvPreProductDetailResponse response) {
         //查询DI层级，根据DI层级设置数量取值
@@ -139,6 +144,11 @@ public class InvPreInProductDetailServiceImpl implements InvPreinProductDetailSe
                 response.setInCount(response.getCount());
             }
         }
+        InvSpace invSpace = invSpaceService.findByCode(response.getInvCode(), response.getInvSpaceCode());
+        if (invSpace != null)
+            response.setInvSpaceName(invSpace.getName());
+
+
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
         response.setActionName(busType.getName());

src/main/java/com/glxp/api/service/inv/impl/InvPreProductDetailServiceImpl.java

@@ -10,6 +10,7 @@ import com.glxp.api.dao.basic.BasicBussinessTypeDao;
 import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inv.InvPreProductDetailDao;
+import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
@@ -19,6 +20,7 @@ import com.glxp.api.req.inv.FilterInvPreProductDetailRequest;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.inv.InvPreProductDetailResponse;
+import com.glxp.api.service.auth.InvSpaceService;
 import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -109,6 +111,10 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
         return invPreProductDetailDao.filterPreProductDetailList(invPreProductDetailRequest);
     }
 
+
+    @Resource
+    InvSpaceService invSpaceService;
+
     @Override
     public void setOrderInfo(InvPreProductDetailResponse response) {
         //查询DI层级，根据DI层级设置数量取值
@@ -133,6 +139,11 @@ public class InvPreProductDetailServiceImpl implements InvPreProductDetailServic
                 response.setInCount(response.getCount());
             }
         }
+
+        InvSpace invSpace = invSpaceService.findByCode(response.getInvCode(), response.getInvSpaceCode());
+        if (invSpace != null)
+            response.setInvSpaceName(invSpace.getName());
+
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));
         response.setActionName(busType.getName());

src/main/java/com/glxp/api/service/inv/impl/InvProductDetailServiceImpl.java

@@ -5,15 +5,18 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantType;
+import com.glxp.api.dao.auth.InvSpaceDao;
 import com.glxp.api.dao.basic.BasicBussinessTypeDao;
 import com.glxp.api.dao.basic.UdiProductDao;
 import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inv.InvProductDetailDao;
+import com.glxp.api.entity.auth.InvSpace;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inv.InvProductDetailEntity;
 import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.res.inv.InvProductDetailResponse;
+import com.glxp.api.service.auth.InvSpaceService;
 import com.glxp.api.service.inv.InvProductDetailService;
 import com.glxp.api.util.DateUtil;
 import org.springframework.stereotype.Service;
@@ -124,6 +127,9 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
         return invProductDetailDao.deleteInvProductDetail(detailRequest);
     }
 
+    @Resource
+    InvSpaceService invSpaceService;
+
     @Override
     public void setOrderInfo(InvProductDetailResponse response) {
         //查询DI层级，根据DI层级设置数量取值
@@ -148,6 +154,9 @@ public class InvProductDetailServiceImpl implements InvProductDetailService {
                 response.setInCount(response.getCount());
             }
         }
+        InvSpace invSpace = invSpaceService.findByCode(response.getInvCode(), response.getInvSpaceCode());
+        if (invSpace != null)
+            response.setInvSpaceName(invSpace.getName());
 
         //设置单据类型名称
         BasicBussinessTypeEntity busType = bussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().select("name").eq("action", response.getAction()));

src/main/java/com/glxp/api/service/inv/impl/InvProductServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inv.InvProductDao;
+import com.glxp.api.dao.inv.InvProductDetailDao;
 import com.glxp.api.entity.inv.InvProductEntity;
 import com.glxp.api.req.inv.FilterInvProductRequest;
 import com.glxp.api.res.inv.InvProductResponse;
@@ -21,6 +22,8 @@ public class InvProductServiceImpl implements InvProductService {
 
     @Resource
     InvProductDao invProductDao;
+    @Resource
+    InvProductDetailDao invProductDetailDao;
 
     @Override
     public int insert(InvProductEntity invProductEntity) {
@@ -67,6 +70,18 @@ public class InvProductServiceImpl implements InvProductService {
         return invProductDao.filterList(filterInvProductRequest);
     }
 
+    @Override
+    public List<InvProductResponse> findGroupBySpace(FilterInvProductRequest filterInvProductRequest) {
+        if (null == filterInvProductRequest) {
+            return Collections.emptyList();
+        }
+        if (null != filterInvProductRequest.getPage() && null != filterInvProductRequest.getLimit()) {
+            PageHelper.offsetPage((filterInvProductRequest.getPage() - 1) * filterInvProductRequest.getLimit(), filterInvProductRequest.getLimit());
+        }
+        return invProductDetailDao.findGroupBySpace(filterInvProductRequest);
+
+    }
+
     @Override
     public InvProductEntity findById(String id) {
         return invProductDao.selectById(id);

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -160,6 +160,14 @@ public class HeartService {
             logs = logs + "单据条码信息：" + spsSyncOrderResponse.getCodeEntities().size() + "条\n";
         basicExportStatusEntity1.setRemark(logs);
         basicExportStatusEntity1.setUpdateTime(new Date());
+        try {
+            String fileFullPath = writeFile(filePrefix, NEW_ALL_ORDER, JsonUtils.toJsonString(spsSyncOrderResponse));
+            basicExportStatusEntity1.setCacheFilePath(fileFullPath);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+
         basicExportService.updateExportStatus(basicExportStatusEntity1);
         return ResultVOUtils.success();
     }
@@ -273,6 +281,7 @@ public class HeartService {
      * @return
      */
     public SpsSyncBasicDataResponse getBasicData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
+        StringBuffer remark = new StringBuffer();
         SpsSyncBasicDataResponse dataResponse = null;
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
@@ -293,6 +302,7 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(hospTypeList)) {
                 dataResponse = new SpsSyncBasicDataResponse();
                 dataResponse.setHospTypeList(hospTypeList);
+                remark.append("物资字典分类信息：").append(hospTypeList.size()).append("条\n");
             }
             List<UdiRelevanceEntity> udiRelevanceList = udiRelevanceDao.selectList(Wrappers.lambdaQuery(UdiRelevanceEntity.class)
                     .le((boolean) map.get("isNew"), UdiRelevanceEntity::getUpdateTime, now)
@@ -304,6 +314,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setUdiRelevanceList(udiRelevanceList);
+                remark.append("物资字典主表信息：").append(udiRelevanceList.size()).append("条\n");
             }
             List<BasicProductsEntity> productsList = basicProductsDao.selectList(Wrappers.lambdaQuery(BasicProductsEntity.class)
                     .le((boolean) map.get("isNew"), BasicProductsEntity::getUpdateTime, now)
@@ -315,6 +326,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setProductsList(productsList);
+                remark.append("物资字典字表信息：").append(udiRelevanceList.size()).append("条\n");
             }
             List<CompanyProductRelevanceEntity> relevanceList = relevanceDao.selectList(Wrappers.lambdaQuery(CompanyProductRelevanceEntity.class)
                     .le((boolean) map.get("isNew"), CompanyProductRelevanceEntity::getUpdateTime, now)
@@ -326,6 +338,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setRelevanceList(relevanceList);
+                remark.append("供应商物资字典信息：").append(relevanceList.size()).append("条\n");
             }
         }
         //确认有开启往来单位字典同步
@@ -346,6 +359,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setCorpList(corpList);
+                remark.append("往来单位信息：").append(corpList.size()).append("条\n");
             }
         }
 
@@ -367,6 +381,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setSupCertList(supCertList);
+                remark.append("资质证书信息：").append(supCertList.size()).append("条\n");
             }
             List<SupCertSetEntity> supCertSetList = supCertSetDao.selectList(Wrappers.lambdaQuery(SupCertSetEntity.class)
                     .le((boolean) map.get("isNew"), SupCertSetEntity::getUpdateTime, now)
@@ -378,6 +393,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setSupCertSetList(supCertSetList);
+                remark.append("资质证书要求设置信息：").append(supCertSetList.size()).append("条\n");
             }
             List<SupCompanyEntity> supCompanyList = supCompanyDao.selectList(Wrappers.lambdaQuery(SupCompanyEntity.class)
                     .le((boolean) map.get("isNew"), SupCompanyEntity::getUpdateTime, now)
@@ -389,6 +405,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setSupCompanyList(supCompanyList);
+                remark.append("供应商资质信息：").append(supCompanyList.size()).append("条\n");
             }
             List<SupManufacturerEntity> supManufacturerList = supManufacturerDao.selectList(Wrappers.lambdaQuery(SupManufacturerEntity.class)
                     .le((boolean) map.get("isNew"), SupManufacturerEntity::getUpdateTime, now)
@@ -400,6 +417,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setSupManufacturerList(supManufacturerList);
+                remark.append("生产企业资质信息：").append(supManufacturerList.size()).append("条\n");
             }
             List<SupProductEntity> supProductList = supProductDao.selectList(Wrappers.lambdaQuery(SupProductEntity.class)
                     .le((boolean) map.get("isNew"), SupProductEntity::getUpdateTime, now)
@@ -411,12 +429,14 @@ public class HeartService {
                     dataResponse = new SpsSyncBasicDataResponse();
                 }
                 dataResponse.setSupProductList(supProductList);
+                remark.append("配送产品资质信息：").append(supProductList.size()).append("条\n");
             }
 
         }
         if (dataResponse != null) {
             dataResponse.setTaskId(taskId);
             dataResponse.setType(BasicExportTypeEnum.BASIC_DATA.getRemark());
+            dataResponse.setSyncRemark(remark.toString());
         }
 
         return dataResponse;
@@ -432,7 +452,7 @@ public class HeartService {
      * @return
      */
     public SpsSyncOtherDataResponse getOtherData(SyncDataSetEntity info, String taskId, Date now, Date syncTime) {
-
+        StringBuffer remark = new StringBuffer();
         SpsSyncOtherDataResponse dataResponse = null;
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
@@ -453,6 +473,7 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(ioCodeLostList)) {
                 dataResponse = new SpsSyncOtherDataResponse();
                 dataResponse.setIoCodeLostList(ioCodeLostList);
+                remark.append("UDI码补齐信息：").append(ioCodeLostList.size()).append("条\n");
             }
         }
         //确认有开启udi关联关系同步
@@ -473,11 +494,13 @@ public class HeartService {
                     dataResponse = new SpsSyncOtherDataResponse();
                 }
                 dataResponse.setIoCodeRelList(ioCodeRelList);
+                remark.append("UDI码关联关系：").append(ioCodeRelList.size()).append("条\n");
             }
         }
         if (dataResponse != null) {
             dataResponse.setTaskId(taskId);
             dataResponse.setType(BasicExportTypeEnum.OTHER_DATA.getRemark());
+            dataResponse.setSyncRemark(remark.toString());
         }
 
         return dataResponse;
@@ -522,9 +545,10 @@ public class HeartService {
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
         syncTimeMap.put("oldDate", syncTime);
+        StringBuffer remark = new StringBuffer();
 
-        //确认有开启业务单据类型同步
+        //确认有开启扫码单据类型同步
-        if (needExec(info.getTypeBus())) {
+        if (needExec(info.getTypeScan())) {
             Map<String, Object> map;
             if (syncTime == null) {
                 map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSSINESS_TYPE);
@@ -539,11 +563,11 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(bussinessTypeEntities)) {
                 dataResponse = new SpsSyncBusResponse();
                 dataResponse.setBussinessTypeEntities(bussinessTypeEntities);
+                remark.append("扫码单据类型信息：").append(bussinessTypeEntities.size()).append("条\n");
             }
         }
-
+        //确认有开启业务单据类型同步
-        //确认有开启扫码单据类型同步
+        if (needExec(info.getTypeBus())) {
-        if (needExec(info.getTypeScan())) {
             Map<String, Object> map;
             if (syncTime == null) {
                 map = basicExportStatusTimeInfo(now, BasicExportStatusTimeEnum.BASIC_BUSTYPE_CHANGE);
@@ -560,6 +584,7 @@ public class HeartService {
                     dataResponse = new SpsSyncBusResponse();
                 }
                 dataResponse.setBusTypeChangeEntities(busTypeChangeList);
+                remark.append("业务单据类型：").append(busTypeChangeList.size()).append("条\n");
             }
         }
 
@@ -581,12 +606,14 @@ public class HeartService {
                     dataResponse = new SpsSyncBusResponse();
                 }
                 dataResponse.setThrBusTypeOriginEntities(thrBusTypeOriginEntities);
+                remark.append("第三方单据类型信息：").append(thrBusTypeOriginEntities.size()).append("条\n");
             }
         }
 
         if (dataResponse != null) {
             dataResponse.setTaskId(taskId);
             dataResponse.setType(BasicExportTypeEnum.DOCUMENT_TYPE_DATA.getRemark());
+            dataResponse.setSyncRemark(remark.toString());
 
         }
         return dataResponse;
@@ -614,7 +641,7 @@ public class HeartService {
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
         syncTimeMap.put("oldDate", syncTime);
-
+        StringBuffer remark = new StringBuffer();
         //确认有开启部门信息同步
         if (needExec(info.getBasicDept())) {
             Map<String, Object> map;
@@ -631,6 +658,7 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(deptEntityList)) {
                 dataResponse = new SpsSyncDataResponse();
                 dataResponse.setDeptEntityList(deptEntityList);
+                remark.append("部门信息：").append(deptEntityList.size()).append("条\n");
             }
             List<DeptUserEntity> deptUserEntityList = deptUserService.list(Wrappers.lambdaQuery(DeptUserEntity.class)
                     .le((boolean) map.get("isNew"), DeptUserEntity::getUpdateTime, now)
@@ -642,6 +670,7 @@ public class HeartService {
                     dataResponse = new SpsSyncDataResponse();
                 }
                 dataResponse.setDeptUserEntities(deptUserEntityList);
+                remark.append("部门用户信息：").append(deptEntityList.size()).append("条\n");
             }
         }
 
@@ -662,6 +691,7 @@ public class HeartService {
                 if (dataResponse == null) {
                     dataResponse = new SpsSyncDataResponse();
                 }
+                remark.append("仓库字典信息：").append(warehouseEntityList.size()).append("条\n");
                 dataResponse.setInvWarehouseEntities(warehouseEntityList);
             }
             List<WarehouseUserEntity> warehouseUserEntities = warehouseUserService.list(Wrappers.lambdaQuery(WarehouseUserEntity.class)
@@ -673,6 +703,7 @@ public class HeartService {
                 if (dataResponse == null) {
                     dataResponse = new SpsSyncDataResponse();
                 }
+                remark.append("仓库用户信息：").append(warehouseUserEntities.size()).append("条\n");
                 dataResponse.setWarehouseUserEntities(warehouseUserEntities);
             }
             List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.list(Wrappers.lambdaQuery(WarehouseBussinessTypeEntity.class)
@@ -685,6 +716,7 @@ public class HeartService {
                     dataResponse = new SpsSyncDataResponse();
                 }
                 dataResponse.setWarehouseBussinessTypeEntities(warehouseBussinessTypeEntities);
+                remark.append("仓库单据类型信息：").append(warehouseBussinessTypeEntities.size()).append("条\n");
             }
             List<InvSpace> invSpaceList = invSpaceService.list(Wrappers.lambdaQuery(InvSpace.class)
                     .le((boolean) map.get("isNew"), InvSpace::getUpdateTime, now)
@@ -696,6 +728,7 @@ public class HeartService {
                     dataResponse = new SpsSyncDataResponse();
                 }
                 dataResponse.setInvSpaces(invSpaceList);
+                remark.append("货位信息：").append(invSpaceList.size()).append("条\n");
             }
         }
 
@@ -717,6 +750,7 @@ public class HeartService {
                     dataResponse = new SpsSyncDataResponse();
                 }
                 dataResponse.setAuthAdminList(adminList);
+                remark.append("系统用户信息：").append(adminList.size()).append("条\n");
             }
             List<InvBusUserEntity> busUserEntities = invBusUserService.list(Wrappers.lambdaQuery(InvBusUserEntity.class)
                     .le((boolean) map.get("isNew"), InvBusUserEntity::getUpdateTime, now)
@@ -728,12 +762,14 @@ public class HeartService {
                     dataResponse = new SpsSyncDataResponse();
                 }
                 dataResponse.setInvBusUserEntities(busUserEntities);
+                remark.append("用户关联单据信息：").append(busUserEntities.size()).append("条\n");
             }
         }
 
         if (dataResponse != null) {
             dataResponse.setTaskId(taskId);
             dataResponse.setType(BasicExportTypeEnum.USER_DATA.getRemark());
+            dataResponse.setSyncRemark(remark.toString());
         }
         return dataResponse;
     }
@@ -756,7 +792,7 @@ public class HeartService {
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
         syncTimeMap.put("oldDate", syncTime);
-
+        StringBuffer remark = new StringBuffer();
         //确认有开启第三方部门信息同步
         if (needExec(info.getBasicThirdInv())) {
             Map<String, Object> map;
@@ -773,6 +809,7 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(deptEntityList)) {
                 dataResponse = new SpsSyncThrDataResponse();
                 dataResponse.setDeptEntities(deptEntityList);
+                remark.append("第三方部门信息：").append(deptEntityList.size()).append("条\n");
             }
         }
 
@@ -794,6 +831,7 @@ public class HeartService {
                     dataResponse = new SpsSyncThrDataResponse();
                 }
                 dataResponse.setInvWarehouseEntities(warehouseEntityList);
+                remark.append("第三方仓库信息：").append(warehouseEntityList.size()).append("条\n");
             }
         }
 
@@ -815,6 +853,7 @@ public class HeartService {
                     dataResponse = new SpsSyncThrDataResponse();
                 }
                 dataResponse.setProductsEntityList(productsEntityList);
+                remark.append("第三方产品信息：").append(productsEntityList.size()).append("条\n");
             }
         }
 
@@ -836,12 +875,14 @@ public class HeartService {
                     dataResponse = new SpsSyncThrDataResponse();
                 }
                 dataResponse.setCorpEntities(corpEntities);
+                remark.append("第三方往来信息：").append(corpEntities.size()).append("条\n");
             }
         }
 
         if (dataResponse != null) {
             dataResponse.setTaskId(taskId);
             dataResponse.setType(BasicExportTypeEnum.THIRD_DATA.getRemark());
+            dataResponse.setSyncRemark(remark.toString());
         }
         return dataResponse;
     }
@@ -871,6 +912,7 @@ public class HeartService {
         Map<String, Object> syncTimeMap = new WeakHashMap<>(3);
         syncTimeMap.put("isNew", true);
         syncTimeMap.put("oldDate", syncTime);
+        StringBuffer remark = new StringBuffer();
         if (needExec(info.getSystemConfig())) {
             Map<String, Object> map;
             if (syncTime == null) {
@@ -886,6 +928,7 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(systemParamConfigEntities)) {
                 dataResponse = new SpsSyncSysSettingResponse();
                 dataResponse.setSystemParamConfigEntities(systemParamConfigEntities);
+                remark.append("运行参数设置信息：").append(systemParamConfigEntities.size()).append("条\n");
             }
         }
         if (needExec(info.getEntrustAction())) {
@@ -905,6 +948,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setEntrustReceEntities(entrustReceEntities);
+                remark.append("委托验收设置信息：").append(entrustReceEntities.size()).append("条\n");
             }
         }
         if (needExec(info.getPrintConfig())) {
@@ -924,6 +968,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setSystemPDFModuleEntities(systemPDFModuleEntities);
+                remark.append("系统模板模块信息：").append(systemPDFModuleEntities.size()).append("条\n");
             }
 
             List<SystemPDFTemplateEntity> systemPDFTemplateEntities = systemPDFTemplateService.list(Wrappers.lambdaQuery(SystemPDFTemplateEntity.class)
@@ -936,6 +981,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setSystemPDFTemplateEntities(systemPDFTemplateEntities);
+                remark.append("模板信息：").append(systemPDFTemplateEntities.size()).append("条\n");
             }
 
             List<SysPdfTemplateRelevanceCodeEntity> sysPdfTemplateRelevanceCodeEntities = systemPDFTemplateRelevanceCodeService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceCodeEntity.class)
@@ -948,6 +994,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setSysPdfTemplateRelevanceCodeEntities(sysPdfTemplateRelevanceCodeEntities);
+                remark.append("扫码单据关联模板信息：").append(sysPdfTemplateRelevanceCodeEntities.size()).append("条\n");
             }
 
             List<SysPdfTemplateRelevanceBizEntity> sysPdfTemplateRelevanceBizEntities = systemPDFTemplateRelevanceBizService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceBizEntity.class)
@@ -960,6 +1007,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setSysPdfTemplateRelevanceBizEntities(sysPdfTemplateRelevanceBizEntities);
+                remark.append("业务单据关联模板信息：").append(sysPdfTemplateRelevanceBizEntities.size()).append("条\n");
             }
 
             List<SysPdfTemplateRelevanceLabelEntity> sysPdfTemplateRelevanceLabelEntities = systemPDFTemplateRelevanceLabelService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceLabelEntity.class)
@@ -972,6 +1020,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setSysPdfTemplateRelevanceLabelEntities(sysPdfTemplateRelevanceLabelEntities);
+                remark.append("标签关联模板信息：").append(sysPdfTemplateRelevanceLabelEntities.size()).append("条\n");
             }
 
             List<SysPdfTemplateRelevanceStatemenEntity> sysPdfTemplateRelevanceStatemenEntities = systemPDFTemplateRelevanceStatemenService.list(Wrappers.lambdaQuery(SysPdfTemplateRelevanceStatemenEntity.class)
@@ -984,6 +1033,7 @@ public class HeartService {
                     dataResponse = new SpsSyncSysSettingResponse();
                 }
                 dataResponse.setSysPdfTemplateRelevanceStatemenEntities(sysPdfTemplateRelevanceStatemenEntities);
+                remark.append("报表关联模板信息：").append(sysPdfTemplateRelevanceStatemenEntities.size()).append("条\n");
             }
         }
 
@@ -1002,6 +1052,7 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(basicBusTypePreEntities)) {
                 dataResponse = new SpsSyncSysSettingResponse();
                 dataResponse.setBasicBusTypePreEntities(basicBusTypePreEntities);
+                remark.append("出入库单自动补单设置信息：").append(basicBusTypePreEntities.size()).append("条\n");
             }
         }
         if (needExec(info.getBusChangeConfig())) {
@@ -1019,12 +1070,14 @@ public class HeartService {
             if (CollectionUtil.isNotEmpty(basicBusTypeChangeEntities)) {
                 dataResponse = new SpsSyncSysSettingResponse();
                 dataResponse.setBasicBusTypeChangeEntities(basicBusTypeChangeEntities);
+                remark.append("业务单自动补单设置信息：").append(basicBusTypeChangeEntities.size()).append("条\n");
             }
         }
 
         if (dataResponse != null) {
             dataResponse.setTaskId(taskId);
             dataResponse.setType(BasicExportTypeEnum.SYS_SET_DATA.getRemark());
+            dataResponse.setSyncRemark(remark.toString());
             if (CollUtil.isNotEmpty(dataResponse.getSystemPDFTemplateEntities())) {
 //            List<Map<String, String>> list = new ArrayList<>(spsSyncSysSettingResponse.getSystemPDFTemplateEntities().size() * 2);
                 List<String> list = new ArrayList<>();
@@ -1068,6 +1121,9 @@ public class HeartService {
         if (baseResponse.getCode() != 20000) {
             status = StatusEnum.FAILED.getCode();
         }
+
+
+        BaseSyncResponse baseSyncResponse = (BaseSyncResponse) data;
         BasicExportStatusEntity exportStatus = BasicExportStatusEntity.builder()
                 .id(taskId)
                 .status(status)
@@ -1076,9 +1132,9 @@ public class HeartService {
                 .startTime(new Date())
                 .endTime(new Date())
                 .updateTime(new Date())
-                .receiveStatus(status)
+                .receiveStatus(status + "")
                 .scheduleType(BasicProcessStatus.SCHEDULE_NORMAL)
-                .remark(baseResponse.getMessage())
+                .remark(baseSyncResponse.getSyncRemark())
                 .build();
         try {
             String fileFullPath = writeFile(filePrefix, exportType.getRemark(), JsonUtils.toJsonString(data));
@@ -1284,7 +1340,7 @@ public class HeartService {
     //下载最近更新扫码单据--上级服务
     @Transactional(propagation = Propagation.NESTED)
     public void dlAllOrder() {
-        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + "");
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_ORDER + "", "3");
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse != null ? baseResponse.getData() : new ArrayList<>();
         if (pageSimpleResponse != null) {
             List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
@@ -1304,9 +1360,9 @@ public class HeartService {
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER);
                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
                         basicDownloadStatusEntity.setType(NEW_ALL_ORDER);
+                        basicDownloadStatusEntity.setRemark(syncDataResponse.getSyncRemark());
                         basicDownloadStatusEntity.setScheduleType(1);
                         basicDownloadService.insertDownloadStatus(basicDownloadStatusEntity);
-                        StringBuffer remark = new StringBuffer();
 
                         if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities())) {
                             try {
@@ -1314,6 +1370,7 @@ public class HeartService {
                                 for (IoOrderEntity orderEntity : orderEntities) {
                                     orderEntity.setUpdateTime(null);
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
+                                    orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                     IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo());
                                     if (temp == null) {
@@ -1329,29 +1386,15 @@ public class HeartService {
                                     }
                                 }
 
-                                String logs = "";
-                                if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities()))
-                                    logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n";
-                                if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities()))
-                                    logs = logs + "业务详情：" + syncDataResponse.getOrderDetailBizEntities().size() + "条\n";
-                                if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities()))
-                                    logs = logs + "单据扫码详情：" + syncDataResponse.getOrderDetailCodeEntities().size() + "条\n";
-                                if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailResultEntities()))
-                                    logs = logs + "单据结果详情：" + syncDataResponse.getOrderDetailResultEntities().size() + "条\n";
-                                if (CollUtil.isNotEmpty(syncDataResponse.getCodeEntities()))
-                                    logs = logs + "单据条码信息：" + syncDataResponse.getCodeEntities().size() + "条\n";
-                                remark.append(logs);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
 
 
                         }
-                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+                        spGetHttp.finishTask(basicExportStatusEntity.getId());
-
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
-                        basicDownloadStatusEntity.setRemark(remark.toString());
                         basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
 
@@ -1365,7 +1408,7 @@ public class HeartService {
     //    下载最近更新国家库数据-上级服务
     @Transactional(propagation = Propagation.NESTED)
     public void dlAllDiProducts() {
-        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS);
+        BaseResponse<List<BasicExportStatusEntity>> baseResponse = spGetHttp.getBasicStatus(NEW_ALL_UDIS, "3");
         List<BasicExportStatusEntity> pageSimpleResponse = baseResponse.getData();
         if (pageSimpleResponse != null) {
             List<BasicExportStatusEntity> basicExportStatusEntities = pageSimpleResponse;
@@ -1414,11 +1457,17 @@ public class HeartService {
                             remark.append("产品信息：").append(spSyncUdiResponse.getProductInfoEntityList().size()).append("条\n");
                         }
                         batchSession.close();
-                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
+//                        spGetHttp.postBasicStatus(basicExportStatusEntity.getId());
-
+                        spGetHttp.finishTask(basicExportStatusEntity.getId());
                         basicDownloadStatusEntity.setUpdateTime(new Date());
                         basicDownloadStatusEntity.setEndTime(new Date());
                         basicDownloadStatusEntity.setRemark(remark.toString());
+                        try {
+                            String fileFullPath = writeFile(filePrefix, NEW_ALL_UDIS, JSONUtil.toJsonStr(response.getData()));
+                            basicDownloadStatusEntity.setCacheFilePath(fileFullPath);
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
                         basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode());
                         basicDownloadService.updateDownloadStatus(basicDownloadStatusEntity);
                     }
@@ -1476,6 +1525,8 @@ public class HeartService {
             String taskId = bean.getTaskId();
             if (StrUtil.isNotBlank(taskId)) {
                 //插入下载记录
+                cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(bean.getFileContent());
+                String remark = jsonObject.getStr(Constant.SYNC_REMARK);
                 BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                 basicDownloadStatusEntity.setId(CustomUtil.getId());
                 basicDownloadStatusEntity.setTaskId(taskId);
@@ -1483,6 +1534,7 @@ public class HeartService {
                 basicDownloadStatusEntity.setUpdateTime(new Date());
                 basicDownloadStatusEntity.setEndTime(new Date());
                 basicDownloadStatusEntity.setIdDatas(exportType.getKey());
+                basicDownloadStatusEntity.setRemark(remark);
                 basicDownloadStatusEntity.setStatus(StatusEnum.SUCCESS.getCode()); //下载完成
                 basicDownloadStatusEntity.setType(exportType.getRemark());
                 basicDownloadStatusEntity.setScheduleType(1);
@@ -1781,6 +1833,7 @@ public class HeartService {
             List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
             for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
                 if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+                    orderInvoiceEntity.setId(null);
                     orderInvoiceService.insertInvoice(orderInvoiceEntity);
                 }
             }

src/main/java/com/glxp/api/task/SyncHeartTask.java

@@ -86,7 +86,7 @@ public class SyncHeartTask implements SchedulingConfigurer {
 
 
             //定时上传最近更新单据数据至上游轮询时间
-            long timeInterval2 = syncDataSetEntity.getOrderSyncTime() * 60 * 1000L;
+            long timeInterval2 = syncDataSetEntity.getOrderSyncTime() * 6 * 1000L;
             long curTime2 = System.currentTimeMillis();
             Long lastTime2 = (Long) redisUtil.get("SPS_SYNC_UPLOAD_ORDER");
             if (lastTime2 == null) {

src/main/java/com/glxp/api/upload/DownloadController.java

@@ -90,10 +90,10 @@ public class DownloadController {
             }
         }
     }
+
     @GetMapping(value = "/udiwms/donwload/printFile")
     public void printFile(HttpServletResponse response, @RequestParam String fileName) throws IOException {
-
+        String url = filePath + "pdf/template/" + fileName;
-        String url="D:\\udi\\udiwms\\udiwmsfile\\pdf\\template\\"+fileName;
         OutputStream os = null;
         try {
             FileInputStream input = new FileInputStream(new File(url));

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
   jmx:
     enabled: false
   servlet:

src/main/resources/mybatis/mapper/auth/DeptUserDao.xml

@@ -98,8 +98,8 @@
     </delete>
 
 
-    <insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
+    <insert id="insertBatch"  parameterType="java.util.List">
-        insert INTO auth_dept_user
+        replace INTO auth_dept_user
                 (deptId, userId)
                 values
         <foreach collection="list" item="item" index="index"

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -19,6 +19,9 @@
             <if test="advanceType != null">
                 AND a.advanceType = #{advanceType}
             </if>
+            <if test="filterAdvanceType != null">
+                AND (a.advanceType = 2 or advanceType = 3)
+            </if>
             <if test="parentId != '' and parentId != null">
                 AND a.parentId = #{parentId}
             </if>
@@ -38,11 +41,11 @@
                a4.name
                        thirdName4
         from auth_warehouse
-                 LEFT JOIN thr_inv_warehouse a on a.code = auth_warehouse.thirdId
+                     LEFT JOIN thr_inv_warehouse a on a.code = auth_warehouse.thirdId
-                 LEFT JOIN thr_inv_warehouse a1 on a1.code = auth_warehouse.thirdId1
+                     LEFT JOIN thr_inv_warehouse a1 on a1.code = auth_warehouse.thirdId1
-                 LEFT JOIN thr_inv_warehouse a2 on a2.code = auth_warehouse.thirdId2
+                     LEFT JOIN thr_inv_warehouse a2 on a2.code = auth_warehouse.thirdId2
-                 LEFT JOIN thr_inv_warehouse a3 on a3.code = auth_warehouse.thirdId3
+                     LEFT JOIN thr_inv_warehouse a3 on a3.code = auth_warehouse.thirdId3
-                 LEFT JOIN thr_inv_warehouse a4 on a4.code = auth_warehouse.thirdId4
+                     LEFT JOIN thr_inv_warehouse a4 on a4.code = auth_warehouse.thirdId4
         <where>
             <if test="code != '' and code != null">
                 AND auth_warehouse.code = #{code}
@@ -57,13 +60,13 @@
         limit 1
     </select>
 
-    <select id="getByWareId"  resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+    <select id="getByWareId" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select *
         FROM auth_warehouse
         WHERE id = #{id}
     </select>
 
-    <select id="getByWarePcode"  resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+    <select id="getByWarePcode" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select *
         FROM auth_warehouse
         WHERE parentCode = #{parentCode}
@@ -73,9 +76,9 @@
     <select id="filterGroupInvSub" parameterType="com.glxp.api.req.auth.FilterInvWarehouseRequest"
             resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select auth_warehouse.*, auth_dept.`name` AS warehouseName from auth_warehouse
-            INNER JOIN
+                INNER JOIN
-        auth_dept
+                auth_dept
-        on auth_warehouse.parentId = auth_dept.code
+                        on auth_warehouse.parentId = auth_dept.code
         <if test="userId != '' and userId != null">
             INNER JOIN auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         </if>
@@ -100,7 +103,7 @@
             </if>
             <if test="superiorCode != '' and superiorCode != null">
                 AND (auth_dept.code = #{superiorPcode}
-                    OR auth_dept.pcode = #{superiorCode})
+                        OR auth_dept.pcode = #{superiorCode})
             </if>
             <if test="subordinateCode != '' and subordinateCode != null">
                 AND auth_dept.pcode = #{subordinateCode}
@@ -145,23 +148,23 @@
     <insert id="insertInvSubWarehouse" keyProperty="id"
             parameterType="com.glxp.api.entity.auth.InvWarehouseEntity">
         replace
-        INTO auth_warehouse
+                INTO auth_warehouse
-                ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse,parentCode
+                ( id, code, `name`, parentId, remark, defaultInv, advanceType, spUse, parentCode
-                , thirdId, thirdId1, thirdId2, thirdId3, thirdId4)
+                , thirdId, thirdId1, thirdId2, thirdId3, thirdId4, updateTime)
         values (#{id},
-        #{code},
+                #{code},
-        #{name},
+                #{name},
-        #{parentId},
+                #{parentId},
-        #{remark},
+                #{remark},
-        #{defaultInv},
+                #{defaultInv},
-        #{advanceType},
+                #{advanceType},
-        #{spUse},
+                #{spUse},
-        #{parentCode},
+                #{parentCode},
-        #{thirdId},
+                #{thirdId},
-        #{thirdId1},
+                #{thirdId1},
-        #{thirdId2},
+                #{thirdId2},
-        #{thirdId3},
+                #{thirdId3},
-        #{thirdId4})
+                #{thirdId4}, #{updateTime})
     </insert>
 
 
@@ -223,16 +226,20 @@
             <if test="spUse != null">
                 spUse=#{spUse},
             </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
 
     <insert id="importInvSubWarehouse" parameterType="java.util.List">
         replace
-            into auth_warehouse
+                into auth_warehouse
-        (id, code, `name`, parentId, remark, defaultInv, parentCode, advanceType, thirdId, thirdId1, thirdId2, thirdId3,
+                (id, code, `name`, parentId, remark, defaultInv, parentCode, advanceType, thirdId, thirdId1, thirdId2,
-         thirdId4)
+                 thirdId3,
-        values
+                 thirdId4, updateTime)
+                values
 
 
         <foreach collection="invWarehouseEntities" item="item" index="index" separator=",">
@@ -248,7 +255,7 @@
              #{item.thirdId1},
              #{item.thirdId2},
              #{item.thirdId3},
-             #{item.thirdId4})
+             #{item.thirdId4}, {item.updateTime})
         </foreach>
     </insert>
 
@@ -290,8 +297,8 @@
                c.name    parentInvName,
                a.spUse
         FROM auth_warehouse a
-                 left join auth_dept b on a.parentId = b.code
+                     left join auth_dept b on a.parentId = b.code
-                 left join auth_warehouse c on a.parentCode = c.code
+                     left join auth_warehouse c on a.parentCode = c.code
         <where>
             <if test="id != '' and id != null">
                 AND a.id = #{id}
@@ -312,8 +319,8 @@
                 AND a.advanceType = #{advanceType}
             </if>
             <if test="key != null and key != ''">
-                AND  (a.name like concat('%', #{key}, '%') or
+                AND (a.name like concat('%', #{key}, '%') or
-                a.code = #{key})
+                     a.code = #{key})
             </if>
         </where>
     </select>
@@ -322,9 +329,9 @@
             resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         select auth_warehouse.*, auth_dept.`name` AS warehouseName
         from auth_warehouse
-                 INNER JOIN
+                     INNER JOIN
-             auth_dept
+                     auth_dept
-             on auth_warehouse.parentId = auth_dept.code
+                             on auth_warehouse.parentId = auth_dept.code
         <where>
             <if test="subordinateCode != '' and subordinateCode != null">
                 AND auth_dept.pcode = #{subordinateCode}
@@ -348,8 +355,8 @@
                b.name parentName,
                a.parentCode
         from auth_warehouse a
-                 left join auth_dept b on a.parentId = b.code
+                     left join auth_dept b on a.parentId = b.code
-                 left join auth_warehouse_user c on a.code = c.code
+                     left join auth_warehouse_user c on a.code = c.code
         <where>
             <if test="userId != null">
                 AND c.userId = #{userId}
@@ -371,8 +378,8 @@
                auth_warehouse.parentCode,
                auth_dept.name warehouseName
         from auth_warehouse
-                 inner join auth_dept on auth_warehouse.parentId = auth_dept.code
+                     inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                 LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+                     LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         <where>
             <if test="userId != null">
                 AND auth_warehouse_user.userId = #{userId}
@@ -408,12 +415,18 @@
         </where>
     </select>
 
-    <select id="selectLowWarehouseAll" parameterType="java.lang.String" resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
+    <select id="selectLowWarehouseAll" parameterType="java.lang.String"
+            resultType="com.glxp.api.entity.auth.InvWarehouseEntity">
         with recursive table_a as (
-            select * from auth_warehouse ta where parentCode = #{pcode}
+                select *
-            union all
+                from auth_warehouse ta
-            select tb.* from auth_warehouse tb inner join table_a on table_a.code = tb.parentCode
+                where parentCode = #{pcode}
-        )
+                union all
-        select * from  table_a
+                select tb.*
+                from auth_warehouse tb
+                             inner join table_a on table_a.code = tb.parentCode
+                )
+        select *
+        from table_a
     </select>
 </mapper>

src/main/resources/mybatis/mapper/auth/SysRoleMenuMapper.xml

@@ -3,7 +3,6 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.auth.SysRoleMenuMapper">
-
     <resultMap type="com.glxp.api.entity.auth.SysRoleMenu" id="SysRoleMenuResult">
         <result property="roleId" column="role_id"/>
         <result property="menuId" column="menu_id"/>
@@ -15,10 +14,10 @@
         SELECT *
         FROM auth_role_menu
         <where>
-            <if test="roleId != null ">
+            <if test="roleId != null">
                 and role_id = #{roleId}
             </if>
-            <if test="menuId != null ">
+            <if test="menuId != null">
                 and menu_id = #{menuId}
             </if>
         </where>
@@ -34,27 +33,21 @@
     >
         delete
         from auth_role_menu
-        where role_id in
+                where role_id in
         <foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
             #{item}
         </foreach>
-
     </delete>
 
 
     <insert id="insertBatch" keyProperty="id" parameterType="java.util.List">
-        insert INTO auth_role_menu
+        replace INTO auth_role_menu
-        (
+                (role_id, menu_id)
-        role_id,menu_id
+                values
-        )
-        values
         <foreach collection="list" item="item" index="index"
                  separator=",">
-            (
+            (#{item.roleId},
-            #{item.roleId},
+             #{item.menuId})
-            #{item.menuId}
-            )
         </foreach>
     </insert>
-
 </mapper>

src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -2,19 +2,19 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.basic.ProductInfoDao">
-
     <select id="filterProductInfo" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        SELECT * FROM productinfo
+        SELECT *
+        FROM productinfo
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
@@ -23,31 +23,31 @@
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat(#{ggxh},'%')
+                AND ggxh LIKE concat(#{ggxh}, '%')
             </if>
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
-            <if test="updateTime!=null and updateTime!=''">
+            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
-
-
         </where>
-
     </select>
     <select id="filterProductGroup" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        SELECT * FROM productinfo
+        SELECT *
+        FROM productinfo
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
@@ -56,13 +56,15 @@
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat(#{ggxh},'%')
+                AND ggxh LIKE concat(#{ggxh}, '%')
             </if>
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
-            <if test="updateTime!=null and updateTime!=''">
+            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
         GROUP BY uuid
@@ -70,22 +72,25 @@
 
     <select id="filterCpmctymc" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        select * from productinfo
+        select *
+        from productinfo
         <where>
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
-            <if test="updateTime!=null and updateTime!=''">
+            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
         GROUP BY cpmctymc
@@ -94,23 +99,26 @@
 
     <select id="filterUdiByTyshxydm" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        SELECT * FROM productinfo
+        SELECT *
+        FROM productinfo
         <where>
             diType = 1
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
-            <if test="updateTime!=null and updateTime!=''">
+            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
         GROUP BY nameCode
@@ -118,8 +126,9 @@
 
     <select id="selectAllByUuid" parameterType="java.util.List"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        select * from productinfo where
+        select *
-        uuid in (
+        from productinfo where
+                uuid in (
         <foreach collection="ids" item="item" index="index"
                  separator=",">
             #{item}
@@ -137,27 +146,27 @@
     <!--   CHAR_LENGTH(nameCode)  <![CDATA[ >= ]]>  14-->
     <select id="filterUdiByCreditNo" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-
+        select p.* from productinfo p
-        select p.* from productinfo p INNER JOIN
+                INNER JOIN
-        (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo
+                (select deviceRecordKey, max(versionNumber) versionNumber
+                 from productinfo
 
         <where>
-
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
         </where>
         GROUP BY deviceRecordKey)
-        a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
+                a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
         <where>
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
@@ -168,17 +177,17 @@
 
     <select id="filterUdiByNewest" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-
+        SELECT *
-        SELECT * FROM productinfo
+        FROM productinfo
         <where>
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
@@ -191,72 +200,73 @@
 
     <select id="filterUuidByCreditNo" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="java.lang.String">
-
+        select p.uuid from productinfo p
-        select p.uuid from productinfo p INNER JOIN
+                INNER JOIN
-        (select deviceRecordKey ,max(versionNumber) versionNumber from productinfo
+                (select deviceRecordKey, max(versionNumber) versionNumber
+                 from productinfo
 
         <where>
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
         </where>
         GROUP BY deviceRecordKey)
-        a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
+                a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber
-        group by uuid
+                group by uuid
     </select>
     <select id="filterUdi" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-
+        select *
-        select * from productinfo
+        from productinfo
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc= #{ylqxzcrbarmc}
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
             </if>
 
             <if test="ylqxzcrbarmc == '' and cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
 
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%',#{ggxh},'%')
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                AND zczbhhzbapzbh LIKE concat('%',#{zczbhhzbapzbh},'%')
+                AND zczbhhzbapzbh LIKE concat('%', #{zczbhhzbapzbh}, '%')
             </if>
 
             <if test="deviceRecordKey != '' and deviceRecordKey != null">
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>
-            <if test="updateTime!=null and updateTime!=''">
+            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
-            <if test="isNewest != null and isNewest!=''">
+            <if test="isNewest != null and isNewest != ''">
                 AND isNewest = #{isNewest}
             </if>
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
             </if>
         </where>
-
-
     </select>
 
 
@@ -368,24 +378,23 @@
 
     <select id="syncDlUdi" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-
+        SELECT *
-        SELECT * FROM productinfo
+        FROM productinfo
         <where>
-
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc},'%')
+                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
             </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc},'%')
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode},'%')
+                AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%',#{ggxh},'%')
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
                 AND zczbhhzbapzbh = #{zczbhhzbapzbh}
@@ -393,137 +402,133 @@
             <if test="deviceRecordKey != '' and deviceRecordKey != null">
                 AND deviceRecordKey = #{deviceRecordKey}
             </if>
-            <if test="updateTime!=null and updateTime!=''">
+            <if test="updateTime != null and updateTime != ''">
-                <![CDATA[   and updateTime>=  DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')   ]]>
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
             </if>
         </where>
         limit #{page},#{limit}
     </select>
 
 
-    <insert id="insertProductInfo" keyProperty="id"
+    <insert id="insertProductInfo"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE
-        INTO productinfo
+                INTO productinfo
-        (
+                (id, nameCode, packRatio, packLevel, bhxjsl,
-        id,nameCode,packRatio,packLevel,bhxjsl,
+                 bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy,
-        bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
+                 thirdProductName,
-        cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
+                 cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm,
-        ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
+                 versionNumber
-        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+                        , diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq,
-,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
+                 ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, cplx, hchzsb
-        )
+                        , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs)
-        values
+        values (#{id},
-            (
+                #{nameCode},
-        #{id},
+                #{packRatio},
-        #{nameCode},
+                #{packLevel},
-        #{packRatio},
+                #{bhxjsl},
-        #{packLevel},
+                #{bhzxxsbzsl},
-        #{bhxjsl},
+                #{zxxsbzbhsydysl},
-        #{bhzxxsbzsl},
+                #{bhxjcpbm},
-        #{zxxsbzbhsydysl},
+                #{bzcj},
-        #{bhxjcpbm},
+                #{thirdProductNo},
-        #{bzcj},
+                #{addType},
-        #{thirdProductNo},
+                #{deviceRecordKey},
-        #{addType},
+                #{isUseDy},
-        #{deviceRecordKey},
+                #{thirdProductName},
-        #{isUseDy},
+                #{cpmctymc},
-        #{thirdProductName},
+                #{cplb},
-        #{cpmctymc},
+                #{flbm},
-        #{cplb},
+                #{ggxh},
-        #{flbm},
+                #{qxlb},
-        #{ggxh},
+                #{tyshxydm},
-        #{qxlb},
+                #{ylqxzcrbarmc},
-        #{tyshxydm},
+                #{zczbhhzbapzbh},
-        #{ylqxzcrbarmc},
+                #{ylqxzcrbarywmc},
-        #{zczbhhzbapzbh},
+                #{uuid},
-        #{ylqxzcrbarywmc},
+                #{sjcpbm},
-        #{uuid},
+                #{versionNumber},
-        #{sjcpbm},
+                #{diType},
-        #{versionNumber},
+                #{scbssfbhph},
-        #{diType},
+                #{scbssfbhxlh},
-        #{scbssfbhph},
+                #{scbssfbhscrq},
-        #{scbssfbhxlh},
+                #{scbssfbhsxrq},
-        #{scbssfbhscrq},
+                #{ybbm},
-        #{scbssfbhsxrq},
+                #{spmc},
-        #{ybbm},
+                #{cphhhbh},
-        #{spmc},
+                #{cpms},
-        #{cphhhbh},
+                #{cpbsbmtxmc},
-        #{cpms},
+                #{isNewest},
-        #{cpbsbmtxmc},
+                #{updateTime},
-        #{isNewest},
+                #{cplx},
-        #{updateTime},
+                #{hchzsb},
-        #{cplx},
+                #{sfwblztlcp},
-        #{hchzsb},
+                #{cgzmraqxgxx},
-        #{sfwblztlcp},
+                #{sfbjwycxsy},
-        #{cgzmraqxgxx},
+                #{zdcfsycs},
-        #{sfbjwycxsy},
+                #{sfwwjbz},
-        #{zdcfsycs},
+                #{syqsfxyjxmj},
-        #{sfwwjbz},
+                #{qtxxdwzlj},
-        #{syqsfxyjxmj},
+                #{mjfs})
-        #{qtxxdwzlj},
-        #{mjfs}
-        )
     </insert>
 
 
     <insert id="insertProductInfos" keyProperty="id"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE INTO productinfo
-        (
+                (id, nameCode, packRatio, packLevel, bhxjsl,
-        id,nameCode,packRatio,packLevel,bhxjsl,
+                 bhzxxsbzsl, zxxsbzbhsydysl, bhxjcpbm, bzcj, thirdProductNo, addType, deviceRecordKey, isUseDy,
-        bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,thirdProductNo,addType,deviceRecordKey,isUseDy,thirdProductName,
+                 thirdProductName,
-        cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber
+                 cpmctymc, cplb, flbm, ggxh, qxlb, tyshxydm, ylqxzcrbarmc, zczbhhzbapzbh, ylqxzcrbarywmc, uuid, sjcpbm,
-        ,diType,scbssfbhph,scbssfbhxlh,scbssfbhscrq,scbssfbhsxrq,
+                 versionNumber
-        ybbm,spmc,cphhhbh,cpms,cpbsbmtxmc,isNewest,updateTime,cplx,hchzsb
+                        , diType, scbssfbhph, scbssfbhxlh, scbssfbhscrq, scbssfbhsxrq,
-        ,sfwblztlcp,cgzmraqxgxx,sfbjwycxsy,zdcfsycs,sfwwjbz,syqsfxyjxmj,qtxxdwzlj,mjfs
+                 ybbm, spmc, cphhhbh, cpms, cpbsbmtxmc, isNewest, updateTime, cplx, hchzsb
-        ) values
+                        , sfwblztlcp, cgzmraqxgxx, sfbjwycxsy, zdcfsycs, sfwwjbz, syqsfxyjxmj, qtxxdwzlj, mjfs) values
 
         <foreach collection="datas" item="item" index="index"
                  separator=",">
-
+            (#{item.id},
-
+             #{item.nameCode},
-            (
+             #{item.packRatio},
-            #{item.id},
+             #{item.packLevel},
-            #{item.nameCode},
+             #{item.bhxjsl},
-            #{item.packRatio},
+             #{item.bhzxxsbzsl},
-            #{item.packLevel},
+             #{item.zxxsbzbhsydysl},
-            #{item.bhxjsl},
+             #{item.bhxjcpbm},
-            #{item.bhzxxsbzsl},
+             #{item.bzcj},
-            #{item.zxxsbzbhsydysl},
+             #{item.thirdProductNo},
-            #{item.bhxjcpbm},
+             #{item.addType},
-            #{item.bzcj},
+             #{item.deviceRecordKey},
-            #{item.thirdProductNo},
+             #{item.isUseDy},
-            #{item.addType},
+             #{item.thirdProductName},
-            #{item.deviceRecordKey},
+             #{item.cpmctymc},
-            #{item.isUseDy},
+             #{item.cplb},
-            #{item.thirdProductName},
+             #{item.flbm},
-            #{item.cpmctymc},
+             #{item.ggxh},
-            #{item.cplb},
+             #{item.qxlb},
-            #{item.flbm},
+             #{item.tyshxydm},
-            #{item.ggxh},
+             #{item.ylqxzcrbarmc},
-            #{item.qxlb},
+             #{item.zczbhhzbapzbh},
-            #{item.tyshxydm},
+             #{item.ylqxzcrbarywmc},
-            #{item.ylqxzcrbarmc},
+             #{item.uuid},
-            #{item.zczbhhzbapzbh},
+             #{item.sjcpbm},
-            #{item.ylqxzcrbarywmc},
+             #{item.versionNumber},
-            #{item.uuid},
+             #{item.diType},
-            #{item.sjcpbm},
+             #{item.scbssfbhph},
-            #{item.versionNumber},
+             #{item.scbssfbhxlh},
-            #{item.diType},
+             #{item.scbssfbhscrq},
-            #{item.scbssfbhph},
+             #{item.scbssfbhsxrq},
-            #{item.scbssfbhxlh},
+             #{item.ybbm},
-            #{item.scbssfbhscrq},
+             #{item.spmc},
-            #{item.scbssfbhsxrq},
+             #{item.cphhhbh},
-            #{item.ybbm},
+             #{item.cpms},
-            #{item.spmc},
+             #{item.cpbsbmtxmc},
-            #{item.cphhhbh},
+             #{item.isNewest},
-            #{item.cpms},
+             #{item.updateTime}, #{item.cplx}, #{item.hchzsb}, #{item.sfwblztlcp}, #{item.cgzmraqxgxx},
-            #{item.cpbsbmtxmc},
+             #{item.sfbjwycxsy}, #{item.zdcfsycs}
-            #{item.isNewest},
+                    , #{item.sfwwjbz}, #{item.syqsfxyjxmj}, #{item.qtxxdwzlj}, #{item.mjfs})
-            #{item.updateTime},#{item.cplx},#{item.hchzsb},#{item.sfwblztlcp},#{item.cgzmraqxgxx},#{item.sfbjwycxsy},#{item.zdcfsycs}
-            ,#{item.sfwwjbz},#{item.syqsfxyjxmj},#{item.qtxxdwzlj},#{item.mjfs}
-            )
         </foreach>
     </insert>
 
@@ -534,7 +539,8 @@
     </delete>
 
     <delete id="deleteAll" parameterType="java.util.List">
-        DELETE FROM productinfo WHERE thirdProductNo in
+        DELETE
+        FROM productinfo WHERE thirdProductNo in
         <foreach collection="ids" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -543,44 +549,117 @@
     <update id="updateProductInfo" parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         UPDATE productinfo
         <set>
-            <if test="nameCode != null">nameCode=#{nameCode},</if>
+            <if test="nameCode != null">
-            <if test="packRatio != null">packRatio=#{packRatio},</if>
+                nameCode=#{nameCode},
-            <if test="packLevel != null">packLevel=#{packLevel},</if>
+            </if>
-            <if test="bhxjsl != null">bhxjsl=#{bhxjsl},</if>
+            <if test="packRatio != null">
-            <if test="bhzxxsbzsl != null">bhzxxsbzsl=#{bhzxxsbzsl},</if>
+                packRatio=#{packRatio},
-            <if test="zxxsbzbhsydysl != null">zxxsbzbhsydysl=#{zxxsbzbhsydysl},</if>
+            </if>
-            <if test="bhxjcpbm != null">bhxjcpbm=#{bhxjcpbm},</if>
+            <if test="packLevel != null">
-            <if test="bzcj != null">bzcj=#{bzcj},</if>
+                packLevel=#{packLevel},
-            <if test="thirdProductNo != null">thirdProductNo=#{thirdProductNo},</if>
+            </if>
-            <if test="addType != null">addType=#{addType},</if>
+            <if test="bhxjsl != null">
-            <if test="deviceRecordKey != null">deviceRecordKey=#{deviceRecordKey},</if>
+                bhxjsl=#{bhxjsl},
-            <if test="isUseDy != null">isUseDy=#{isUseDy},</if>
+            </if>
-            <if test="thirdProductName != null">thirdProductName=#{thirdProductName},</if>
+            <if test="bhzxxsbzsl != null">
-            <if test="cpmctymc != null">cpmctymc=#{cpmctymc},</if>
+                bhzxxsbzsl=#{bhzxxsbzsl},
-            <if test="cplb != null">cplb=#{cplb},</if>
+            </if>
-            <if test="flbm != null">flbm=#{flbm},</if>
+            <if test="zxxsbzbhsydysl != null">
-            <if test="ggxh != null">ggxh=#{ggxh},</if>
+                zxxsbzbhsydysl=#{zxxsbzbhsydysl},
-            <if test="qxlb != null">qxlb=#{qxlb},</if>
+            </if>
-            <if test="tyshxydm != null">tyshxydm=#{tyshxydm},</if>
+            <if test="bhxjcpbm != null">
-            <if test="ylqxzcrbarmc != null">ylqxzcrbarmc=#{ylqxzcrbarmc},</if>
+                bhxjcpbm=#{bhxjcpbm},
-            <if test="ylqxzcrbarywmc != null">ylqxzcrbarywmc=#{ylqxzcrbarywmc},</if>
+            </if>
-            <if test="uuid != null">uuid=#{uuid},</if>
+            <if test="bzcj != null">
-            <if test="sjcpbm != null">sjcpbm=#{sjcpbm},</if>
+                bzcj=#{bzcj},
-            <if test="versionNumber != null">versionNumber=#{versionNumber},</if>
+            </if>
-            <if test="diType != null">diType=#{diType},</if>
+            <if test="thirdProductNo != null">
-            <if test="isNewest != null">isNewest=#{isNewest},</if>
+                thirdProductNo=#{thirdProductNo},
-            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            </if>
-            <if test="cplx != null">cplx=#{cplx},</if>
+            <if test="addType != null">
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+                addType=#{addType},
-            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            </if>
-            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="deviceRecordKey != null">
-            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+                deviceRecordKey=#{deviceRecordKey},
-            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            </if>
-            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="isUseDy != null">
-            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+                isUseDy=#{isUseDy},
-            </if>
+            </if>
-            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="thirdProductName != null">
-            <if test="mjfs != null">mjfs=#{mjfs},</if>
+                thirdProductName=#{thirdProductName},
+            </if>
+            <if test="cpmctymc != null">
+                cpmctymc=#{cpmctymc},
+            </if>
+            <if test="cplb != null">
+                cplb=#{cplb},
+            </if>
+            <if test="flbm != null">
+                flbm=#{flbm},
+            </if>
+            <if test="ggxh != null">
+                ggxh=#{ggxh},
+            </if>
+            <if test="qxlb != null">
+                qxlb=#{qxlb},
+            </if>
+            <if test="tyshxydm != null">
+                tyshxydm=#{tyshxydm},
+            </if>
+            <if test="ylqxzcrbarmc != null">
+                ylqxzcrbarmc=#{ylqxzcrbarmc},
+            </if>
+            <if test="ylqxzcrbarywmc != null">
+                ylqxzcrbarywmc=#{ylqxzcrbarywmc},
+            </if>
+            <if test="uuid != null">
+                uuid=#{uuid},
+            </if>
+            <if test="sjcpbm != null">
+                sjcpbm=#{sjcpbm},
+            </if>
+            <if test="versionNumber != null">
+                versionNumber=#{versionNumber},
+            </if>
+            <if test="diType != null">
+                diType=#{diType},
+            </if>
+            <if test="isNewest != null">
+                isNewest=#{isNewest},
+            </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
+            <if test="cplx != null">
+                cplx=#{cplx},
+            </if>
+            <if test="hchzsb != null">
+                hchzsb=#{hchzsb},
+            </if>
+            <if test="sfwblztlcp != null">
+                sfwblztlcp=#{sfwblztlcp},
+            </if>
+            <if test="cgzmraqxgxx != null">
+                cgzmraqxgxx=#{cgzmraqxgxx},
+            </if>
+            <if test="sfbjwycxsy != null">
+                sfbjwycxsy=#{sfbjwycxsy},
+            </if>
+            <if test="zdcfsycs != null">
+                zdcfsycs=#{zdcfsycs},
+            </if>
+            <if test="sfwwjbz != null">
+                sfwwjbz=#{sfwwjbz},
+            </if>
+            <if test="syqsfxyjxmj != null">
+                syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">
+                qtxxdwzlj=#{qtxxdwzlj},
+            </if>
+            <if test="mjfs != null">
+                mjfs=#{mjfs},
+            </if>
         </set>
         WHERE id = #{id}
     </update>
@@ -588,29 +667,69 @@
     <update id="updateProductByUuid" parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         UPDATE productinfo
         <set>
-            <if test="scbssfbhph != null">scbssfbhph=#{scbssfbhph},</if>
+            <if test="scbssfbhph != null">
-            <if test="scbssfbhxlh != null">scbssfbhxlh=#{scbssfbhxlh},</if>
+                scbssfbhph=#{scbssfbhph},
-            <if test="scbssfbhscrq != null">scbssfbhscrq=#{scbssfbhscrq},</if>
+            </if>
-            <if test="scbssfbhsxrq != null">scbssfbhsxrq=#{scbssfbhsxrq},</if>
+            <if test="scbssfbhxlh != null">
-            <if test="ybbm != null">ybbm=#{ybbm},</if>
+                scbssfbhxlh=#{scbssfbhxlh},
-            <if test="spmc != null">spmc=#{spmc},</if>
+            </if>
-            <if test="cphhhbh != null">cphhhbh=#{cphhhbh},</if>
+            <if test="scbssfbhscrq != null">
-            <if test="cpms != null">cpms=#{cpms},</if>
+                scbssfbhscrq=#{scbssfbhscrq},
-            <if test="cpbsbmtxmc != null">cpbsbmtxmc=#{cpbsbmtxmc},</if>
+            </if>
-            <if test="isNewest != null">isNewest=#{isNewest},</if>
+            <if test="scbssfbhsxrq != null">
-            <if test="updateTime != null">updateTime=#{updateTime},</if>
+                scbssfbhsxrq=#{scbssfbhsxrq},
-            <if test="cplx != null">cplx=#{cplx},</if>
+            </if>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},
+            <if test="ybbm != null">
-            </if>
+                ybbm=#{ybbm},
-            <if test="sfwblztlcp != null">sfwblztlcp=#{sfwblztlcp},</if>
+            </if>
-            <if test="cgzmraqxgxx != null">cgzmraqxgxx=#{cgzmraqxgxx},</if>
+            <if test="spmc != null">
-            <if test="sfbjwycxsy != null">sfbjwycxsy=#{sfbjwycxsy},</if>
+                spmc=#{spmc},
-            <if test="zdcfsycs != null">zdcfsycs=#{zdcfsycs},</if>
+            </if>
-            <if test="sfwwjbz != null">sfwwjbz=#{sfwwjbz},</if>
+            <if test="cphhhbh != null">
-            <if test="syqsfxyjxmj != null">syqsfxyjxmj=#{syqsfxyjxmj},
+                cphhhbh=#{cphhhbh},
-            </if>
+            </if>
-            <if test="qtxxdwzlj != null">qtxxdwzlj=#{qtxxdwzlj},</if>
+            <if test="cpms != null">
-            <if test="mjfs != null">mjfs=#{mjfs},</if>
+                cpms=#{cpms},
+            </if>
+            <if test="cpbsbmtxmc != null">
+                cpbsbmtxmc=#{cpbsbmtxmc},
+            </if>
+            <if test="isNewest != null">
+                isNewest=#{isNewest},
+            </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
+            <if test="cplx != null">
+                cplx=#{cplx},
+            </if>
+            <if test="hchzsb != null">
+                hchzsb=#{hchzsb},
+            </if>
+            <if test="sfwblztlcp != null">
+                sfwblztlcp=#{sfwblztlcp},
+            </if>
+            <if test="cgzmraqxgxx != null">
+                cgzmraqxgxx=#{cgzmraqxgxx},
+            </if>
+            <if test="sfbjwycxsy != null">
+                sfbjwycxsy=#{sfbjwycxsy},
+            </if>
+            <if test="zdcfsycs != null">
+                zdcfsycs=#{zdcfsycs},
+            </if>
+            <if test="sfwwjbz != null">
+                sfwwjbz=#{sfwwjbz},
+            </if>
+            <if test="syqsfxyjxmj != null">
+                syqsfxyjxmj=#{syqsfxyjxmj},
+            </if>
+            <if test="qtxxdwzlj != null">
+                qtxxdwzlj=#{qtxxdwzlj},
+            </if>
+            <if test="mjfs != null">
+                mjfs=#{mjfs},
+            </if>
         </set>
         WHERE uuid = #{uuid}
     </update>
@@ -620,7 +739,8 @@
     <select id="findAllUuids" parameterType="com.glxp.api.util.page.ListPageRequest" resultType="java.lang.String">
         SELECT uuid
         from device
-        group by uuid limit #{page}, #{limit}
+        group by uuid
+        limit #{page}, #{limit}
     </select>
     <select id="findAllTyshxyh" resultType="java.lang.String">
         SELECT tyshxydm

src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml

@@ -53,6 +53,87 @@
         </where>
     </select>
 
+    <select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
+        select ipp.id,
+               ipp.nameCode,
+               bp.cpmctymc,
+               ipp.relId,
+               bp.ggxh,
+               ipp.batchNo,
+               ipp.produceDate,
+               ipp.expireDate,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               ipp.inCount,
+               ipp.outCount,
+               ipp.reCount,
+               basic_corp.name     supName,
+               ipp.supId,
+               auth_dept.name      deptName,
+               auth_warehouse.name invName,
+               as.name             spaceName,
+               ipp.deptCode,
+               ipp.invCode
+        from inv_prein_product_detail ipp
+                     inner join basic_udirel on ipp.relId = basic_udirel.id
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_space `as` on ipp.code = `as`.code
+        <where>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="relIdFk != null and relIdFk != ''">
+                AND ipp.relId = #{relIdFk}
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND bp.ggxh like concat('%', #{ggxh}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ipp.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productionDate != null and productionDate != ''">
+                AND ipp.produceDate = #{productionDate}
+            </if>
+            <if test="expireDate != null and expireDate != ''">
+                AND ipp.expireDate = #{expireDate}
+            </if>
+            <if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
+                AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="supId != null and supId != ''">
+                AND ipp.supId = #{supId}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND ipp.deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND ipp.invCode = #{invCode}
+            </if>
+            <if test="spaceCode != null and spaceCode != ''">
+                AND ipp.invSpaceCode = #{spaceCode}
+            </if>
+
+            <if test="invCodes != null and invCodes.size() != 0">
+                AND ipp.invCode in
+                <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+
+        GROUP BY ipp.relId, ipp.batchNo
+        order by ipp.updateTime desc
+    </select>
+
     <delete id="deleteInvPreProductDetail">
         delete
         from inv_prein_product_detail
@@ -74,49 +155,70 @@
             </if>
         </where>
     </delete>
-
+    <select id="getInvProductInfo" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
-
+        select ipd.code,
-    <select id="selectGroupDetail" resultType="com.glxp.api.entity.inv.InvPreInProductDetailEntity">
+               ipd.relId,
-        select *
+               ipd.batchNo,
-        from inv_prein_product_detail
+               ipd.serialNo,
+               ipd.invSpaceCode,
+               ipd.invCode,
+               bp.cpmctymc                                                     productName,
+               bp.ggxh,
+               bp.measname,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
+               (select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
+               (select name from basic_corp bc where bc.erpId = ipd.supId)     supName
+        from inv_prein_product_detail ipd
+                     left join basic_udirel bu on bu.id = ipd.relId
+                     left join basic_products bp on bp.uuid = bu.uuid
         <where>
-            <if test="code != null and code != ''">
+            <if test="invCode != null and invCode != ''">
-                AND code = #{code}
+                AND ipd.invCode = #{invCode}
-            </if>
-            <if test="mainAction != null and mainAction != ''">
-                AND mainAction = #{mainAction}
-            </if>
-            <if test="action != null and action != ''">
-                AND action = #{action}
-            </if>
-            <if test="supId != null and supId != ''">
-                and supId = #{supId}
             </if>
-            <if test="relId != null and relId != ''">
+            <if test="invSpaceCode != null and invSpaceCode != ''">
-                AND relId = #{relId}
+                AND ipd.invSpaceCode = #{invSpaceCode}
             </if>
-            <if test="nameCode != null and nameCode != ''">
+            <if test="code != null and code != ''">
-                AND nameCode like concat('%', #{nameCode}, '%')
+                AND ipd.code = #{code}
             </if>
             <if test="orderId != null and orderId != ''">
-                AND orderId = #{orderId}
+                AND ipd.orderId = #{orderId}
-            </if>
-            <if test="deptCode != null and deptCode != ''">
-                AND deptCode = #{deptCode}
             </if>
+        </where>
+        group by ipd.id
+    </select>
+
+    <update id="batchBindSpace">
+        update inv_prein_product_detail
+        set invSpaceCode = #{invSpaceCode}
+                where id in
+        <foreach collection="ids" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+
+    <select id="getInvPlaceOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        select ipd.orderId                                                     billNo,
+               (select name from basic_bussiness_type where action = o.action) billTypeName,
+               o.mainAction,
+               o.fromCorp,
+               o.corpOrderId,
+               o.fromType,
+               o.createTime,
+               o.auditTime,
+               (select employeeName from auth_user where id = o.reviewUser)    reviewUserName
+        from inv_prein_product_detail ipd
+                     left join io_order o on ipd.orderId = o.billNo
+        <where>
             <if test="invCode != null and invCode != ''">
-                AND invCode = #{invCode}
+                AND ipd.invCode = #{invCode}
             </if>
-            <if test="invSpaceCode != null and invSpaceCode != ''">
+            <if test="orderId != null and orderId != ''">
-                AND invSpaceCode = #{invSpaceCode}
+                AND ipd.orderId like concat('%', #{orderId}, '%')
-            </if>
-            <if test="batchNo != null and batchNo != ''">
-                AND batchNo = #{batchNo}
-            </if>
-            <if test="batchNo == null and batchNo == ''">
-                AND batchNo is null
             </if>
         </where>
-        group by
+        group by ipd.orderId
     </select>
 </mapper>

src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml

@@ -3,32 +3,32 @@
 <mapper namespace="com.glxp.api.dao.inv.InvPreProductDao">
     <select id="filterList" resultType="com.glxp.api.res.inv.InvPreProductResponse">
         select ipp.id,
-        ipp.nameCode,
+               ipp.nameCode,
-        bp.cpmctymc,
+               bp.cpmctymc,
-        ipp.relIdFk,
+               ipp.relIdFk,
-        bp.ggxh,
+               bp.ggxh,
-        ipp.batchNo,
+               ipp.batchNo,
-        ipp.productionDate,
+               ipp.productionDate,
-        ipp.expireDate,
+               ipp.expireDate,
-        bp.ylqxzcrbarmc,
+               bp.ylqxzcrbarmc,
-        bp.zczbhhzbapzbh,
+               bp.zczbhhzbapzbh,
-        ipp.inCount,
+               ipp.inCount,
-        ipp.outCount,
+               ipp.outCount,
-        ipp.reCount,
+               ipp.reCount,
-        ipp.customerId,
+               ipp.customerId,
-        basic_corp.name     supName,
+               basic_corp.name     supName,
-        ipp.supId,
+               ipp.supId,
-        auth_dept.name      deptName,
+               auth_dept.name      deptName,
-        auth_warehouse.name invName,
+               auth_warehouse.name invName,
-        ipp.deptCode,
+               ipp.deptCode,
-        ipp.invCode,
+               ipp.invCode,
-        bp.measname
+               bp.measname
         from inv_pre_product ipp
-        inner join basic_udirel on ipp.relIdFk = basic_udirel.id
+                     inner join basic_udirel on ipp.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join basic_corp on ipp.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_dept on auth_dept.code = ipp.deptCode
-        left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">
@@ -82,11 +82,11 @@
     <select id="filterPreProductList" resultType="com.glxp.api.entity.inv.InvPreProductEntity">
         select ipp.*
         from inv_pre_product ipp
-        inner join basic_udirel on ipp.relIdFk = basic_udirel.id
+                     inner join basic_udirel on ipp.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join basic_corp on ipp.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_dept on auth_dept.code = ipp.deptCode
-        left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">

src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml

@@ -1,6 +1,86 @@
 <?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.api.dao.inv.InvPreProductDetailDao">
+    <select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvPreinProductResponse">
+        select ipp.id,
+               ipp.nameCode,
+               bp.cpmctymc,
+               ipp.relId,
+               bp.ggxh,
+               ipp.batchNo,
+               ipp.produceDate,
+               ipp.expireDate,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               ipp.inCount,
+               ipp.outCount,
+               ipp.reCount,
+               basic_corp.name     supName,
+               ipp.supId,
+               auth_dept.name      deptName,
+               auth_warehouse.name invName,
+               as.name             spaceName,
+               ipp.deptCode,
+               ipp.invCode
+        from inv_pre_product_detail ipp
+                     inner join basic_udirel on ipp.relId = basic_udirel.id
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_space `as` on ipp.code = `as`.code
+        <where>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="relIdFk != null and relIdFk != ''">
+                AND ipp.relId = #{relIdFk}
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND bp.ggxh like concat('%', #{ggxh}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ipp.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productionDate != null and productionDate != ''">
+                AND ipp.produceDate = #{productionDate}
+            </if>
+            <if test="expireDate != null and expireDate != ''">
+                AND ipp.expireDate = #{expireDate}
+            </if>
+            <if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
+                AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="supId != null and supId != ''">
+                AND ipp.supId = #{supId}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND ipp.deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND ipp.invCode = #{invCode}
+            </if>
+            <if test="spaceCode != null and spaceCode != ''">
+                AND ipp.invSpaceCode = #{spaceCode}
+            </if>
+
+            <if test="invCodes != null and invCodes.size() != 0">
+                AND ipp.invCode in
+                <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY ipp.relId, ipp.batchNo
+        order by ipp.updateTime desc
+    </select>
+
     <select id="filterPreProductDetailList" resultType="com.glxp.api.entity.inv.InvPreProductDetailEntity">
         select *
         from inv_pre_product_detail
@@ -74,4 +154,71 @@
             </if>
         </where>
     </delete>
+
+    <select id="getInvProductInfo" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
+        select ipd.code,
+               ipd.relId,
+               ipd.batchNo,
+               ipd.serialNo,
+               ipd.invSpaceCode,
+               ipd.invCode,
+               bp.cpmctymc                                                     productName,
+               bp.ggxh,
+               bp.measname,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
+               (select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
+               (select name from basic_corp bc where bc.erpId = ipd.supId)     supName
+        from inv_pre_product_detail ipd
+                     left join basic_udirel bu on bu.id = ipd.relId
+                     left join basic_products bp on bp.uuid = bu.uuid
+        <where>
+            <if test="invCode != null and invCode != ''">
+                AND ipd.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND ipd.invSpaceCode = #{invSpaceCode}
+            </if>
+            <if test="code != null and code != ''">
+                AND ipd.code = #{code}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                AND ipd.orderId = #{orderId}
+            </if>
+        </where>
+        group by ipd.id
+    </select>
+
+    <update id="batchBindSpace">
+        update inv_pre_product_detail
+        set invSpaceCode = #{invSpaceCode}
+                where id in
+        <foreach collection="ids" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
+
+    <select id="getInvPlaceOrderList" resultType="com.glxp.api.res.inout.IoOrderResponse">
+        select ipd.orderId                                                     billNo,
+               (select name from basic_bussiness_type where action = o.action) billTypeName,
+               o.mainAction,
+               o.fromCorp,
+               o.corpOrderId,
+               o.fromType,
+               o.createTime,
+               o.auditTime,
+               (select employeeName from auth_user where id = o.reviewUser)    reviewUserName
+        from inv_pre_product_detail ipd
+                     left join io_order o on ipd.orderId = o.billNo
+        <where>
+            <if test="invCode != null and invCode != ''">
+                AND ipd.invCode = #{invCode}
+            </if>
+            <if test="orderId != null and orderId != ''">
+                AND ipd.orderId like concat('%', #{orderId}, '%')
+            </if>
+        </where>
+        group by ipd.orderId
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml

@@ -134,4 +134,5 @@
             </if>
         </where>
     </select>
+
 </mapper>

src/main/resources/mybatis/mapper/inv/invProductDao.xml

@@ -6,34 +6,34 @@
     <select id="filterList" resultType="com.glxp.api.res.inv.InvProductResponse"
             parameterType="com.glxp.api.req.inv.FilterInvProductRequest">
         select ip.id,
-        ip.nameCode,
+               ip.nameCode,
-        bp.cpmctymc,
+               bp.cpmctymc,
-        bp.measname,
+               bp.measname,
-        ip.relIdFk,
+               ip.relIdFk,
-        bp.ggxh,
+               bp.ggxh,
-        ip.batchNo,
+               ip.batchNo,
-        ip.productionDate,
+               ip.productionDate,
-        ip.expireDate,
+               ip.expireDate,
-        bp.ylqxzcrbarmc,
+               bp.ylqxzcrbarmc,
-        bp.zczbhhzbapzbh,
+               bp.zczbhhzbapzbh,
-        sum(ip.inCount)  as inCount,
+               sum(ip.inCount)  as inCount,
-        sum(ip.outCount) as outCount,
+               sum(ip.outCount) as outCount,
-        sum(ip.reCount)  as reCount,
+               sum(ip.reCount)  as reCount,
-        ip.customerId,
+               ip.customerId,
-        basic_corp.name     supName,
+               basic_corp.name     supName,
-        ip.supId,
+               ip.supId,
-        auth_dept.name      deptName,
+               auth_dept.name      deptName,
-        auth_warehouse.name invName,
+               auth_warehouse.name invName,
-        ip.deptCode,
+               ip.deptCode,
-        ip.invCode,
+               ip.invCode,
-        as.name             spaceName
+               as.name             spaceName
         from inv_product ip
-        inner join basic_udirel on ip.relIdFk = basic_udirel.id
+                     inner join basic_udirel on ip.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ip.supId = basic_corp.erpId
+                     left join basic_corp on ip.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ip.deptCode
+                     left join auth_dept on auth_dept.code = ip.deptCode
-        left join auth_warehouse on auth_warehouse.code = ip.invCode
+                     left join auth_warehouse on auth_warehouse.code = ip.invCode
-        left join auth_space `as` on ip.invSpaceCode = `as`.code
+                     left join auth_space `as` on ip.invSpaceCode = `as`.code
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">
@@ -91,26 +91,26 @@
 
     <select id="stockStatistics" resultType="com.glxp.api.res.inv.InvProductResponse">
         select bp.cpmctymc,
-        bp.nameCode,
+               bp.nameCode,
-        bp.ylqxzcrbarmc,
+               bp.ylqxzcrbarmc,
-        bp.zczbhhzbapzbh,
+               bp.zczbhhzbapzbh,
-        bc.name          supName,
+               bc.name          supName,
-        bp.ggxh,
+               bp.ggxh,
-        aw.name          invName,
+               aw.name          invName,
-        ip.batchNo,
+               ip.batchNo,
-        ip.relIdFk,
+               ip.relIdFk,
-        ip.productionDate,
+               ip.productionDate,
-        ip.expireDate,
+               ip.expireDate,
-        ip.customerId,
+               ip.customerId,
-        ip.supId,
+               ip.supId,
-        sum(ip.inCount)  inCount,
+               sum(ip.inCount)  inCount,
-        sum(ip.outCount) outCount,
+               sum(ip.outCount) outCount,
-        sum(ip.reCount)  reCount
+               sum(ip.reCount)  reCount
         from inv_product ip
-        inner join basic_udirel bu on ip.relIdFk = bu.id
+                     inner join basic_udirel bu on ip.relIdFk = bu.id
-        inner join basic_products bp on bu.uuid = bp.uuid
+                     inner join basic_products bp on bu.uuid = bp.uuid
-        left join basic_corp bc on ip.supId = bc.erpId
+                     left join basic_corp bc on ip.supId = bc.erpId
-        left join auth_warehouse aw on aw.code = ip.invCode
+                     left join auth_warehouse aw on aw.code = ip.invCode
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">
@@ -150,13 +150,13 @@
     <select id="getMAInvProducts" resultType="com.glxp.api.res.inv.InvProductResponse">
         select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate
         from inv_product ip
-        left join inv_product_detail ipd
+                     left join inv_product_detail ipd
-        on ip.relIdFk = ipd.relId and
+                on ip.relIdFk = ipd.relId and
-        ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                   ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
-        left join basic_udirel bu on bu.id = ip.relIdFk
+                     left join basic_udirel bu on bu.id = ip.relIdFk
-        left join basic_products bp on bu.uuid = bp.uuid
+                     left join basic_products bp on bu.uuid = bp.uuid
         <where>
-            ( ip.inCount - ip.outCount ) > 0
+            (ip.inCount - ip.outCount) > 0
             <if test="nameCode != null and nameCode != ''">
                 AND bp.nameCode like concat('%', #{nameCode}, '%')
             </if>
@@ -182,10 +182,10 @@
     <select id="selectProductInfo" resultType="com.glxp.api.entity.inv.InvProductEntity">
         select ip.*
         from inv_product ip
-        left join inv_product_detail ipd on ip.relIdFk = ipd.relId
+                     left join inv_product_detail ipd on ip.relIdFk = ipd.relId
-        and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
-        and ip.deptCode = ipd.deptCode
+                and ip.deptCode = ipd.deptCode
-        and ip.invCode = ipd.invCode
+                and ip.invCode = ipd.invCode
         <where>
             <if test="relId != null and relId != ''">
                 AND ip.relIdFk = #{relId}
@@ -208,22 +208,22 @@
 
     <select id="getCountInvProduct" resultType="com.glxp.api.res.inv.InvProductResponse">
         select inv_product_detail.id,
-        inv_product.relIdFk,
+               inv_product.relIdFk,
-        inv_product.nameCode,
+               inv_product.nameCode,
-        inv_product.batchNo,
+               inv_product.batchNo,
-        inv_product.productionDate,
+               inv_product.productionDate,
-        inv_product.expireDate,
+               inv_product.expireDate,
-        basic_products.ggxh,
+               basic_products.ggxh,
-        inv_product.inCount,
+               inv_product.inCount,
-        inv_product.outCount,
+               inv_product.outCount,
-        sum(inv_product.inCount - inv_product.outCount) reCount,
+               sum(inv_product.inCount - inv_product.outCount) reCount,
-        basic_products.cpmctymc
+               basic_products.cpmctymc
         from inv_product_detail
-        left join inv_product on inv_product_detail.relId = inv_product.relIdFk
+                     left join inv_product on inv_product_detail.relId = inv_product.relIdFk
-        and inv_product.invCode = inv_product_detail.invCode
+                and inv_product.invCode = inv_product_detail.invCode
-        AND IFNULL(inv_product.batchNo, 'empty') = IFNULL(inv_product_detail.batchNo, 'empty')
+                AND IFNULL(inv_product.batchNo, 'empty') = IFNULL(inv_product_detail.batchNo, 'empty')
-        left join basic_udirel on inv_product_detail.relId = basic_udirel.id
+                     left join basic_udirel on inv_product_detail.relId = basic_udirel.id
-        left join basic_products on basic_products.uuid = basic_udirel.uuid
+                     left join basic_products on basic_products.uuid = basic_udirel.uuid
         <where>
             <if test="invCode != null and invCode != ''">
                 AND inv_product_detail.invCode = #{invCode}
@@ -246,19 +246,19 @@
 
     <select id="selectInvProductInfo" resultType="com.glxp.api.entity.inv.InvProductEntity">
         select ip.relIdFk,
-        ip.deptCode,
+               ip.deptCode,
-        ip.invCode,
+               ip.invCode,
-        ipd.invSpaceCode,
+               ipd.invSpaceCode,
-        ip.batchNo,
+               ip.batchNo,
-        ip.productionDate,
+               ip.productionDate,
-        ip.expireDate,
+               ip.expireDate,
-        ip.supId,
+               ip.supId,
-        ip.inCount,
+               ip.inCount,
-        ip.outCount,
+               ip.outCount,
-        ip.reCount
+               ip.reCount
         from inv_product ip
-        left join inv_product_detail ipd
+                     left join inv_product_detail ipd
-        on ip.relIdFk = ipd.relId and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                on ip.relIdFk = ipd.relId and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
         <where>
             <if test="invCode != null and invCode != ''">
                 AND ip.invCode = #{invCode}
@@ -276,10 +276,10 @@
     <select id="filterProductNames" resultType="com.glxp.api.res.inv.InvProductResponse">
         select ip.relIdFk, bp.cpmctymc, bp.ggxh
         from inv_product ip
-        left join inv_product_detail ipd on ip.relIdFk = ipd.relId and ip.invCode = ipd.invCode and
+                     left join inv_product_detail ipd on ip.relIdFk = ipd.relId and ip.invCode = ipd.invCode and
-        ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                                                         ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
-        left join basic_udirel bu on bu.id = ip.relIdFk
+                     left join basic_udirel bu on bu.id = ip.relIdFk
-        left join basic_products bp on bp.uuid = bu.uuid
+                     left join basic_products bp on bp.uuid = bu.uuid
         <where>
             <if test="cpmctymc != null and cpmctymc != ''">
                 AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
@@ -297,33 +297,33 @@
     <select id="filterProductList" resultType="com.glxp.api.res.inv.InvProductResponse"
             parameterType="com.glxp.api.req.inv.FilterInvProductRequest">
         select ip.id,
-        ip.nameCode,
+               ip.nameCode,
-        bp.cpmctymc,
+               bp.cpmctymc,
-        ip.relIdFk,
+               ip.relIdFk,
-        bp.ggxh,
+               bp.ggxh,
-        ip.batchNo,
+               ip.batchNo,
-        ip.productionDate,
+               ip.productionDate,
-        ip.expireDate,
+               ip.expireDate,
-        bp.ylqxzcrbarmc,
+               bp.ylqxzcrbarmc,
-        bp.zczbhhzbapzbh,
+               bp.zczbhhzbapzbh,
-        sum(ip.inCount)  as inCount,
+               sum(ip.inCount)  as inCount,
-        sum(ip.outCount) as outCount,
+               sum(ip.outCount) as outCount,
-        sum(ip.reCount)  as reCount,
+               sum(ip.reCount)  as reCount,
-        ip.customerId,
+               ip.customerId,
-        basic_corp.name     supName,
+               basic_corp.name     supName,
-        ip.supId,
+               ip.supId,
-        auth_dept.name      deptName,
+               auth_dept.name      deptName,
-        auth_warehouse.name invName,
+               auth_warehouse.name invName,
-        ip.deptCode,
+               ip.deptCode,
-        ip.invCode
+               ip.invCode
         from inv_product ip
-        inner join basic_udirel on ip.relIdFk = basic_udirel.id
+                     inner join basic_udirel on ip.relIdFk = basic_udirel.id
-        inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
-        left join basic_corp on ip.supId = basic_corp.erpId
+                     left join basic_corp on ip.supId = basic_corp.erpId
-        left join auth_dept on auth_dept.code = ip.deptCode
+                     left join auth_dept on auth_dept.code = ip.deptCode
-        left join auth_warehouse on auth_warehouse.code = ip.invCode
+                     left join auth_warehouse on auth_warehouse.code = ip.invCode
-        left join inv_product_detail ipd on ip.invCode = ipd.invCode and ip.relIdFk = ipd.relId and
+                     left join inv_product_detail ipd on ip.invCode = ipd.invCode and ip.relIdFk = ipd.relId and
-        ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
+                                                         ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
         <where>
             bp.diType = 1
             <if test="cpmctymc != null and cpmctymc != ''">

src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml

@@ -3,6 +3,86 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inv.InvProductDetailDao">
+    <select id="findGroupBySpace" resultType="com.glxp.api.res.inv.InvProductResponse">
+        select ipp.id,
+               ipp.nameCode,
+               bp.cpmctymc,
+               ipp.relId,
+               bp.ggxh,
+               ipp.batchNo,
+               ipp.produceDate,
+               ipp.expireDate,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               ipp.inCount,
+               ipp.outCount,
+               ipp.reCount,
+               basic_corp.name     supName,
+               ipp.supId,
+               auth_dept.name      deptName,
+               auth_warehouse.name invName,
+               as.name             spaceName,
+               ipp.deptCode,
+               ipp.invCode
+        from inv_product_detail ipp
+                     inner join basic_udirel on ipp.relId = basic_udirel.id
+                     inner join basic_products bp on basic_udirel.uuid = bp.uuid
+                     left join basic_corp on ipp.supId = basic_corp.erpId
+                     left join auth_dept on auth_dept.code = ipp.deptCode
+                     left join auth_warehouse on auth_warehouse.code = ipp.invCode
+                     left join auth_space `as` on ipp.code = `as`.code
+        <where>
+            <if test="cpmctymc != null and cpmctymc != ''">
+                AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != null and nameCode != ''">
+                AND ipp.nameCode like concat('%', #{nameCode}, '%')
+            </if>
+            <if test="relIdFk != null and relIdFk != ''">
+                AND ipp.relId = #{relIdFk}
+            </if>
+            <if test="ggxh != null and ggxh != ''">
+                AND bp.ggxh like concat('%', #{ggxh}, '%')
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ipp.batchNo like concat('%', #{batchNo}, '%')
+            </if>
+            <if test="productionDate != null and productionDate != ''">
+                AND ipp.produceDate = #{productionDate}
+            </if>
+            <if test="expireDate != null and expireDate != ''">
+                AND ipp.expireDate = #{expireDate}
+            </if>
+            <if test="ylqxzcrbarmc != null and ylqxzcrbarmc != ''">
+                AND bp.ylqxzcrbarmc like concat('%', #{ylqxzcrbarmc}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
+                AND bp.zczbhhzbapzbh like concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+            <if test="supId != null and supId != ''">
+                AND ipp.supId = #{supId}
+            </if>
+            <if test="deptCode != null and deptCode != ''">
+                AND ipp.deptCode = #{deptCode}
+            </if>
+            <if test="invCode != null and invCode != ''">
+                AND ipp.invCode = #{invCode}
+            </if>
+            <if test="invSpaceCode != null and invSpaceCode != ''">
+                AND ipp.invSpaceCode = #{invSpaceCode}
+            </if>
+
+            <if test="invCodes != null and invCodes.size() != 0">
+                AND ipp.invCode in
+                <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY ipp.relId, ipp.batchNo
+        order by ipp.updateTime desc
+    </select>
+
     <select id="filterInvProductDetailList" resultType="com.glxp.api.entity.inv.InvProductDetailEntity"
             parameterType="com.glxp.api.req.inv.FilterInvProductDetailRequest">
         select *
@@ -101,12 +181,12 @@
                aw.name        invName,
                sp.name        invSpaceName
         from inv_product_detail pd
-                 left join basic_udirel bu on pd.relId = bu.id
+                     left join basic_udirel bu on pd.relId = bu.id
-                 left join basic_products bp on bp.uuid = bu.uuid
+                     left join basic_products bp on bp.uuid = bu.uuid
-                 left join auth_dept ad on pd.deptCode = ad.code
+                     left join auth_dept ad on pd.deptCode = ad.code
-                 left join auth_warehouse aw on pd.invCode = aw.code
+                     left join auth_warehouse aw on pd.invCode = aw.code
-                 left join auth_space sp on pd.invSpaceCode = sp.code
+                     left join auth_space sp on pd.invSpaceCode = sp.code
-            and sp.invStorageCode = pd.deptCode and sp.invWarehouseCode = pd.invCode
+                and sp.invStorageCode = pd.deptCode and sp.invWarehouseCode = pd.invCode
         <where>
             <if test="deptCode != null and deptCode != ''">
                 AND pd.deptCode = #{deptCode}
@@ -127,7 +207,7 @@
     <update id="batchBindSpace">
         update inv_product_detail
         set invSpaceCode = #{invSpaceCode}
-        where id in
+                where id in
         <foreach collection="ids" index="index" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
@@ -182,8 +262,8 @@
                (select name from auth_space s where s.code = ipd.invSpaceCode) invSpaceName,
                (select name from basic_corp bc where bc.erpId = ipd.supId)     supName
         from inv_product_detail ipd
-                 left join basic_udirel bu on bu.id = ipd.relId
+                     left join basic_udirel bu on bu.id = ipd.relId
-                 left join basic_products bp on bp.uuid = bu.uuid
+                     left join basic_products bp on bp.uuid = bu.uuid
         <where>
             <if test="invCode != null and invCode != ''">
                 AND ipd.invCode = #{invCode}
@@ -210,9 +290,9 @@
                o.fromType,
                o.createTime,
                o.auditTime,
-               (select employeeName from auth_user where id = o.reviewUser) reviewUserName
+               (select employeeName from auth_user where id = o.reviewUser)    reviewUserName
         from inv_product_detail ipd
-                 left join io_order o on ipd.orderId = o.billNo
+                     left join io_order o on ipd.orderId = o.billNo
         <where>
             <if test="invCode != null and invCode != ''">
                 AND ipd.invCode = #{invCode}

src/main/resources/mybatis/mapper/sync/BasicDownloadDao.xml

@@ -34,7 +34,7 @@
             parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">
         replace
                 INTO basic_download_status(id, taskId, idDatas, status, type, updateTime, scheduleType, startTime,
-                                           endTime, remark,cacheFilePath)
+                                           endTime, remark, cacheFilePath)
         values (#{id},
                 #{taskId},
                 #{idDatas},
@@ -45,7 +45,7 @@
                 #{startTime},
                 #{endTime},
                 #{remark},
-        #{cacheFilePath})
+                #{cacheFilePath})
     </insert>
 
     <update id="updateDownloadStatus" parameterType="com.glxp.api.entity.sync.BasicDownloadStatusEntity">
@@ -75,6 +75,9 @@
             <if test="remark != null">
                 remark=#{remark},
             </if>
+            <if test="cacheFilePath != null">
+                cacheFilePath=#{cacheFilePath},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -91,6 +94,8 @@
     </delete>
 
     <delete id="deleteByDate">
-        delete from basic_download_status where date_format(#{date}, '%Y-%m-%d') >= date_format(updateTime, '%Y-%m-%d')
+        delete
+        from basic_download_status
+        where date_format(#{date}, '%Y-%m-%d') >= date_format(updateTime, '%Y-%m-%d')
     </delete>
 </mapper>

src/main/resources/mybatis/mapper/sync/BasicExportDao.xml

@@ -2,28 +2,29 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 
 <mapper namespace="com.glxp.api.dao.sync.BasicExportDao">
-
     <select id="filterExportStatus" parameterType="com.glxp.api.req.sync.BasicExportStatusRequest"
             resultType="com.glxp.api.entity.sync.BasicExportStatusEntity">
-        select * from basic_export_status
+        select *
+        from basic_export_status
         <where>
             <if test="id != null and id != ''">
-                AND id LIKE concat('%',#{id},'%')
+                AND id LIKE concat('%', #{id}, '%')
             </if>
-            <if test="status!=null">
+            <if test="status != null">
                 and status = #{status}
             </if>
-            <if test="type!=null">
+            <if test="type != null">
                 and `type` = #{type}
             </if>
-            <if test="idDatas != '' and idDatas!=null">
+            <if test="idDatas != '' and idDatas != null">
                 and idDatas = #{idDatas}
             </if>
-            <if test="scheduleType!=null">
+            <if test="scheduleType != null">
                 and scheduleType = #{scheduleType}
             </if>
             <if test="syncTime != null and syncTime != ''">
-                and #{syncTime} >= startTime and #{syncTime} &lt;= endTime
+                and #{syncTime} >= startTime
+                and #{syncTime} &lt;= endTime
             </if>
         </where>
         order by updateTime desc
@@ -33,32 +34,50 @@
     <insert id="insertExportStatus" keyProperty="id"
             parameterType="com.glxp.api.entity.sync.BasicExportStatusEntity">
         replace
-        INTO basic_export_status(id,idDatas,status,type,updateTime,scheduleType,startTime,endTime,remark,cacheFilePath)
+                INTO basic_export_status(id, idDatas, status, type, updateTime, scheduleType, startTime, endTime,
-        values(
+                                         remark, cacheFilePath)
-        #{id},
+        values (#{id},
-        #{idDatas},
+                #{idDatas},
-        #{status},
+                #{status},
-        #{type},
+                #{type},
-        #{updateTime},
+                #{updateTime},
-        #{scheduleType},
+                #{scheduleType},
-        #{startTime},
+                #{startTime},
-        #{endTime},
+                #{endTime},
-        #{remark},
+                #{remark},
-        #{cacheFilePath}
+                #{cacheFilePath})
-        )
     </insert>
 
     <update id="updateExportStatus" parameterType="com.glxp.api.entity.sync.BasicExportStatusEntity">
         UPDATE basic_export_status
         <trim prefix="set" suffixOverrides=",">
-            <if test="idDatas != null">idDatas=#{idDatas},</if>
+            <if test="idDatas != null">
-            <if test="status != null">status=#{status},</if>
+                idDatas=#{idDatas},
-            <if test="type != null">type=#{type},</if>
+            </if>
-            <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="status != null">
-            <if test="scheduleType != null">scheduleType=#{scheduleType},</if>
+                status=#{status},
-            <if test="startTime != null">startTime=#{startTime},</if>
+            </if>
-            <if test="endTime != null">endTime=#{endTime},</if>
+            <if test="type != null">
-            <if test="remark != null">remark=#{remark},</if>
+                type=#{type},
+            </if>
+            <if test="updateTime != null">
+                updateTime=#{updateTime},
+            </if>
+            <if test="scheduleType != null">
+                scheduleType=#{scheduleType},
+            </if>
+            <if test="startTime != null">
+                startTime=#{startTime},
+            </if>
+            <if test="endTime != null">
+                endTime=#{endTime},
+            </if>
+            <if test="remark != null">
+                remark=#{remark},
+            </if>
+            <if test="cacheFilePath != null">
+                cacheFilePath=#{cacheFilePath},
+            </if>
         </trim>
         WHERE id = #{id}
     </update>
@@ -69,11 +88,14 @@
     </delete>
 
     <delete id="deleteByTime">
-        Delete From basic_export_status
+        Delete
-        where date(startTime) &lt;= date(DATE_SUB(NOW(),INTERVAL 30 day))
+        From basic_export_status
+        where date(startTime) &lt;= date(DATE_SUB(NOW(), INTERVAL 30 day))
     </delete>
 
     <delete id="deleteByDate">
-        delete from basic_export_status where date_format(#{date}, '%Y-%m-%d') >= date_format(startTime, '%Y-%m-%d')
+        delete
+        from basic_export_status
+        where date_format(#{date}, '%Y-%m-%d') >= date_format(startTime, '%Y-%m-%d')
     </delete>
 </mapper>

src/main/resources/mybatis/mapper/system/SyncDataChangeBustypesDao.xml

@@ -1,17 +1,17 @@
 <?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.api.dao.system.SyncDataChangeBustypesDao">
-  <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
+    <resultMap id="BaseResultMap" type="com.glxp.api.entity.system.SyncDataChangeBustypesEntity">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    <!--@Table sync_data_change_bustypes-->
+        <!--@Table sync_data_change_bustypes-->
-    <id column="id" jdbcType="INTEGER" property="id" />
+        <id column="id" jdbcType="INTEGER" property="id"/>
-    <result column="action" jdbcType="VARCHAR" property="action" />
+        <result column="action" jdbcType="VARCHAR" property="action"/>
-    <result column="name" jdbcType="VARCHAR" property="name" />
+        <result column="name" jdbcType="VARCHAR" property="name"/>
-    <result column="outChange" jdbcType="TINYINT" property="outChange" />
+        <result column="outChange" jdbcType="TINYINT" property="outChange"/>
-    <result column="orderStatus" jdbcType="TINYINT" property="orderStatus" />
+        <result column="orderStatus" jdbcType="TINYINT" property="orderStatus"/>
-  </resultMap>
+    </resultMap>
-  <sql id="Base_Column_List">
+    <sql id="Base_Column_List">
-    <!--@mbg.generated-->
+        <!--@mbg.generated-->
-    id, `action`, `name`, outChange, orderStatus
+        id, `action`, `name`, outChange, orderStatus
-  </sql>
+    </sql>
-</mapper>
+</mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -389,3 +389,5 @@ CALL Pro_Temp_ColumnWork('auth_dept_user', 'userId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('auth_dept_user', 'deptId', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'Id', 'bigint', 2);
 CALL Pro_Temp_ColumnWork('basic_export_status', 'remark', 'varchar(2048)', 2);
+CALL Pro_Temp_ColumnWork('sup_cert', 'filePath', 'text', 2);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'id', 'bigint', 2);