Merge remote-tracking branch 'origin/dev' into dev

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

@@ -409,7 +409,7 @@ public class BasicBussinessTypeController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         bussinessTypeFilterRequest.setEnable(true);
-        bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
+        //bussinessTypeFilterRequest.setMainAction(ConstantType.TYPE_PUT);
         List<BasicBussinessTypeResponse> bussinessTypeEntities;
         bussinessTypeEntities = basicBussinessTypeService.filterList(bussinessTypeFilterRequest);
         PageSimpleResponse<BasicBussinessTypeResponse> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -108,4 +108,9 @@ public class InvProductResponse {
      */
     private String invCode;
 
+    //    货位编号
+    private String invSpaceCode;
+
+    private String code;
+
 }

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

@@ -508,6 +508,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
                 ew.eq("code", bindInvSpaceRequest.getCode());
                 ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
+                ew.eq("mainAction", "WareHouseIn");
                 InvPreInProductDetailEntity invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
                 count = invPreInProductDetailEntity.getInCount();
                 if (invPreInProductDetailEntity == null) {
@@ -537,6 +538,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
                 ew.eq("code", bindInvSpaceRequest.getCode());
                 ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
+                ew.eq("mainAction", "WareHouseIn");
                 InvPreProductDetailEntity invPreProductDetailEntity = invPreProductDetailDao.selectOne(ew);
                 if (invPreProductDetailEntity == null) {
                     return "该产品库存不足！";
@@ -567,6 +569,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
                 ew.eq("code", bindInvSpaceRequest.getCode());
                 ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
+                ew.eq("mainAction", "WareHouseIn");
                 InvProductDetailEntity invProductDetailEntity = invProductDetailDao.selectOne(ew);
                 if (invProductDetailEntity == null) {
                     return "该产品库存不足！";

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

@@ -23,7 +23,9 @@
                auth_warehouse.name             invName,
                as.name                         spaceName,
                ipp.deptCode,
-               ipp.invCode
+               ipp.invCode,
+               ipp.invSpaceCode,
+               ipp.code as code
         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