修改货位上架按当前仓库筛选,和汇总导出加上仓库字段

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

@@ -44,7 +44,7 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus<InvPreInProduct
 
     List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
 
-    Integer getInventoryQuantity(@Param("code") String code);
+    Integer getInventoryQuantity(@Param("code") String code,@Param("invCode") String invCode);
 
     //用货架查询
     List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);

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

@@ -44,7 +44,7 @@ public interface InvPreProductDetailDao extends BaseMapperPlus<InvPreProductDeta
 
     List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
 
-    Integer getInventoryQuantity(@Param("code") String code);
+    Integer getInventoryQuantity(@Param("code") String code,@Param("invCode") String invCode);
 
     //用货架查询
     List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);

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

@@ -97,7 +97,7 @@ public interface InvProductDetailDao extends BaseMapperPlus<InvProductDetailDao,
      */
     List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
 
-    Integer getInventoryQuantity(@Param("code") String code);
+    Integer getInventoryQuantity(@Param("code") String code,@Param("invCode") String invCode);
 
     //用货架查询
     List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);

src/main/java/com/glxp/api/entity/inout/ExcelVO.java

@@ -34,6 +34,10 @@ public class ExcelVO {
     @ApiModelProperty(value = "批次号")
     private String batchNo;
 
+    @ExcelProperty("仓库")
+    @ApiModelProperty(value = "仓库")
+    private String deptName;
+
     @ExcelProperty({"期初","数量"})
     @ApiModelProperty(value = "数量")
     private Integer beginCount;
@@ -83,6 +87,8 @@ public class ExcelVO {
     @ApiModelProperty(value = "金额")
     private BigDecimal balanceAmount;
 
+
+
     //无需导出字段使用此注解
     //@JsonSerialize(using = ToStringSerializer.class)
 

src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java

@@ -196,6 +196,7 @@ public class ExcelServiceImpl implements ExcelService {
                     vo.setId(i+1);
                     vo.setProductName(ioStatDayEntities.get(i).getProductName());
                     vo.setGgxh(ioStatDayEntities.get(i).getGgxh());
+                    vo.setDeptName(ioStatDayEntities.get(i).getDeptName());
                     vo.setBatchNo(ioStatDayEntities.get(i).getBatchNo());
                     vo.setBeginCount(ioStatDayEntities.get(i).getBeginCount());
                     vo.setBeginPrice(ioStatDayEntities.get(i).getBeginPrice());
@@ -219,6 +220,7 @@ public class ExcelServiceImpl implements ExcelService {
                     vo.setProductName(ioStatMonthEntities.get(i).getProductName());
                     vo.setGgxh(ioStatMonthEntities.get(i).getGgxh());
                     vo.setBatchNo(ioStatMonthEntities.get(i).getBatchNo());
+                    vo.setDeptName(ioStatMonthEntities.get(i).getDeptName());
                     vo.setBeginCount(ioStatMonthEntities.get(i).getBeginCount());
                     vo.setBeginPrice(ioStatMonthEntities.get(i).getBeginPrice());
                     vo.setBeginAmount(ioStatMonthEntities.get(i).getBeginAmount());
@@ -241,6 +243,7 @@ public class ExcelServiceImpl implements ExcelService {
                     vo.setProductName(ioStatQuarterEntities.get(i).getProductName());
                     vo.setGgxh(ioStatQuarterEntities.get(i).getGgxh());
                     vo.setBatchNo(ioStatQuarterEntities.get(i).getBatchNo());
+                    vo.setDeptName(ioStatQuarterEntities.get(i).getDeptName());
                     vo.setBeginCount(ioStatQuarterEntities.get(i).getBeginCount());
                     vo.setBeginPrice(ioStatQuarterEntities.get(i).getBeginPrice());
                     vo.setBeginAmount(ioStatQuarterEntities.get(i).getBeginAmount());
@@ -263,6 +266,7 @@ public class ExcelServiceImpl implements ExcelService {
                     vo.setProductName(ioStatYearEntities.get(i).getProductName());
                     vo.setGgxh(ioStatYearEntities.get(i).getGgxh());
                     vo.setBatchNo(ioStatYearEntities.get(i).getBatchNo());
+                    vo.setDeptName(ioStatYearEntities.get(i).getDeptName());
                     vo.setBeginCount(ioStatYearEntities.get(i).getBeginCount());
                     vo.setBeginPrice(ioStatYearEntities.get(i).getBeginPrice());
                     vo.setBeginAmount(ioStatYearEntities.get(i).getBeginAmount());

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

@@ -269,6 +269,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
             QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
             ew.eq("orderId", bindInvSpaceRequest.getOId());
+            ew.eq("invCode", bindInvSpaceRequest.getInvCode());
             ew.eq("mainAction", "WareHouseIn");
             List<InvPreInProductDetailEntity> invPreInProductDetailEntityList = invPreInProductDetailDao.selectList(ew);
             if (invPreInProductDetailEntityList.size() == 0) {
@@ -291,6 +292,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
             QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
             ew.eq("orderId", bindInvSpaceRequest.getOId());
+            ew.eq("invCode", bindInvSpaceRequest.getInvCode());
             ew.eq("mainAction", "WareHouseIn");
             List<InvPreProductDetailEntity> invPreProductDetailEntityList = invPreProductDetailDao.selectList(ew);
             for (InvPreProductDetailEntity invPreProductDetailEntity : invPreProductDetailEntityList) {
@@ -309,6 +311,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
         } else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL) {
             QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
             ew.eq("orderId", bindInvSpaceRequest.getOId());
+            ew.eq("invCode", bindInvSpaceRequest.getInvCode());
             ew.eq("mainAction", "WareHouseIn");
             List<InvProductDetailEntity> invProductDetailEntityList = invProductDetailDao.selectList(ew);
             for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntityList) {

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

@@ -515,7 +515,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                     return "该产品库存不足！";
                 }
             } else {
-                count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+                count = invPreInProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode());
             }
             if (count == null || count <= 0) {
                 return "该产品库存不足！";
@@ -545,7 +545,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 }
                 count = invPreProductDetailEntity.getInCount();
             } else {
-                count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+                count = invPreProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode());
             }
 
             if (count == null || count <= 0) {
@@ -576,7 +576,7 @@ public class InvPlaceServiceImpl implements InvPlaceService {
                 }
                 count = invProductDetailEntity.getInCount();
             } else {
-                count = invProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode());
+                count = invProductDetailDao.getInventoryQuantity(bindInvSpaceRequest.getCode(),bindInvSpaceRequest.getInvCode());
             }
 
             if (count == null || count <= 0) {

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: com.p6spy.engine.spy.P6SpyDriver
-    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/wms_cs?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml

@@ -21,7 +21,7 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatDayEntity">
-        select *
+        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_day.deptCode = auth_dept.CODE ) deptName
         from io_stat_day
         where recordKeyFk = #{recordKey}
     </select>

src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml

@@ -20,7 +20,7 @@
         </where>
     </select>
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatMonthEntity">
-        select *
+        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_month.deptCode = auth_dept.CODE ) deptName
         from io_stat_month
         where recordKeyFk = #{recordKey}
     </select>

src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml

@@ -21,7 +21,7 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatQuarterEntity">
-        select *
+        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_quarter.deptCode = auth_dept.CODE ) deptName
         from io_stat_quarter
         where recordKeyFk = #{recordKey}
     </select>

src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml

@@ -21,7 +21,7 @@
     </select>
 
     <select id="filterListByRecordKey" resultType="com.glxp.api.entity.inout.IoStatYearEntity">
-        select *
+        select *, 	( SELECT NAME FROM auth_dept WHERE io_stat_year.deptCode = auth_dept.CODE ) deptName
         from io_stat_year
         where recordKeyFk = #{recordKey}
     </select>

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

@@ -231,10 +231,11 @@
         group by ipd.orderId
     </select>
 
-    <select id="getInventoryQuantity" resultType="Integer">
+    <select id="getInventoryQuantity" resultType="java.lang.Integer">
         SELECT ifnull(SUM(inCount), 0) - ifnull(SUM(outCount), 0)
         FROM inv_prein_product_detail ipd
         WHERE CODE = #{code}
+          and invCode = #{invCode}
           and (invSpaceCode is null or invSpaceCode = '')
     </select>
 

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

@@ -232,10 +232,11 @@
         group by ipd.orderId
     </select>
 
-    <select id="getInventoryQuantity" resultType="Integer">
+    <select id="getInventoryQuantity" resultType="java.lang.Integer">
         SELECT ifnull(SUM(inCount), 0) - ifnull(SUM(outCount), 0)
         FROM inv_pre_product_detail ipd
         WHERE CODE = #{code}
+          and invCode = #{invCode}
           and (invSpaceCode is null or invSpaceCode = '')
     </select>
 

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

@@ -357,11 +357,13 @@
         group by ipd.orderId
     </select>
 
-    <select id="getInventoryQuantity" resultType="Integer">
+    <select id="getInventoryQuantity" resultType="java.lang.Integer">
         SELECT ifnull(SUM(inCount), 0) - ifnull(SUM(outCount), 0)
         FROM inv_product_detail ipd
         WHERE CODE = #{code}
+          and invCode = #{invCode}
           and (invSpaceCode is null or invSpaceCode = '')
+
     </select>
 
     <select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">