diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java index f3545ec23..4a4859a87 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java @@ -44,7 +44,7 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); - Integer getInventoryQuantity(@Param("code") String code); + Integer getInventoryQuantity(@Param("code") String code,@Param("invCode") String invCode); //用货架查询 List filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest); diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java index 6219b6530..c08e43c5c 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java @@ -44,7 +44,7 @@ public interface InvPreProductDetailDao extends BaseMapperPlus getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); - Integer getInventoryQuantity(@Param("code") String code); + Integer getInventoryQuantity(@Param("code") String code,@Param("invCode") String invCode); //用货架查询 List filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest); diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java index d86aa5fb8..a5c680ad7 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java @@ -97,7 +97,7 @@ public interface InvProductDetailDao extends BaseMapperPlus getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest); - Integer getInventoryQuantity(@Param("code") String code); + Integer getInventoryQuantity(@Param("code") String code,@Param("invCode") String invCode); //用货架查询 List filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest); diff --git a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java b/src/main/java/com/glxp/api/entity/inout/ExcelVO.java index 604ac89cd..740b0c05b 100644 --- a/src/main/java/com/glxp/api/entity/inout/ExcelVO.java +++ b/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) diff --git a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java index f3563b913..b8186f553 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ExcelServiceImpl.java +++ b/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()); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index 98d6b0ce9..852e3827d 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java @@ -139,7 +139,8 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService { String orderNo = gennerOrderUtils.createStatOrderNo(orderNoTypeBean); statOrderEntity.setRecordKey(orderNo); statOrderEntity.setType(2); - statOrderEntity.setDate(yesterday); + DateTime dateTime=DateUtil.offsetDay(yesterday,+1); + statOrderEntity.setDate(dateTime); statOrderEntity.setTitle(yesterday.year() + " 年 " + yesterday.quarter() + " 季度出入库汇总"); Date updateTime = new Date(); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java index fd195640c..cb84cbb14 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatYearServiceImpl.java @@ -130,7 +130,8 @@ public class IoStatYearServiceImpl implements IoStatYearService { String orderNo = gennerOrderUtils.createStatOrderNo(orderNoTypeBean); statOrderEntity.setRecordKey(orderNo); statOrderEntity.setType(1); - statOrderEntity.setDate(yesterday); + DateTime dateTime=DateUtil.offsetDay(yesterday,+1); + statOrderEntity.setDate(dateTime); statOrderEntity.setTitle(yesterday.year() + " 年度出入库汇总"); Date updateTime = new Date(); diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java index dc2f17495..a60037533 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java +++ b/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 ew = new QueryWrapper<>(); ew.eq("orderId", bindInvSpaceRequest.getOId()); + ew.eq("invCode", bindInvSpaceRequest.getInvCode()); ew.eq("mainAction", "WareHouseIn"); List 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 ew = new QueryWrapper<>(); ew.eq("orderId", bindInvSpaceRequest.getOId()); + ew.eq("invCode", bindInvSpaceRequest.getInvCode()); ew.eq("mainAction", "WareHouseIn"); List 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 ew = new QueryWrapper<>(); ew.eq("orderId", bindInvSpaceRequest.getOId()); + ew.eq("invCode", bindInvSpaceRequest.getInvCode()); ew.eq("mainAction", "WareHouseIn"); List invProductDetailEntityList = invProductDetailDao.selectList(ew); for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntityList) { diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index a9380d487..0ddf724d2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/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) { diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 7e59ac974..97dfa2620 100644 --- a/src/main/resources/application-dev.yml +++ b/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: diff --git a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml index d9e6bfc46..87a47b376 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatDayDao.xml @@ -21,7 +21,7 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml index dbff0edd0..f5aae9dfe 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatMonthDao.xml @@ -20,7 +20,7 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml index ad8ba49da..d15d72527 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatQuarterDao.xml @@ -21,7 +21,7 @@ diff --git a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml index ac6996edc..a5360a710 100644 --- a/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoStatYearDao.xml @@ -21,7 +21,7 @@ diff --git a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml index b45bb795e..c6ef2fa36 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml @@ -64,32 +64,32 @@ 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 + 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_prein_product_detail ipd - left join basic_udirel bu on bu.id = ipd.relId - left join basic_products bp on bp.uuid = bu.uuid + left join basic_udirel bu on bu.id = ipd.relId + left join basic_products bp on bp.uuid = bu.uuid AND ipd.invCode = #{invCode} @@ -201,7 +201,7 @@ update inv_prein_product_detail set invSpaceCode = #{invSpaceCode} - where id in + where id in #{item} @@ -209,17 +209,17 @@ - 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 pd.id, - pd.code, - pd.relId, - pd.batchNo, - pd.produceDate, - pd.expireDate, - pd.invSpaceCode, - pd.deptCode, - pd.invCode, - pd.supId, - pd.nameCode, - pd.invSpaceCode, - ifnull(sum(pd.count), 0) as count, - ifnull(sum(pd.inCount), 0) as inCount, - ifnull(sum(pd.outCount), 0) as outCount, - ifnull(sum(pd.reCount), 0) as reCount + pd.code, + pd.relId, + pd.batchNo, + pd.produceDate, + pd.expireDate, + pd.invSpaceCode, + pd.deptCode, + pd.invCode, + pd.supId, + pd.nameCode, + pd.invSpaceCode, + ifnull(sum(pd.count), 0) as count, + ifnull(sum(pd.inCount), 0) as inCount, + ifnull(sum(pd.outCount), 0) as outCount, + ifnull(sum(pd.reCount), 0) as reCount from inv_prein_product_detail pd reCount > 0 diff --git a/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml index 500f86223..28a0d5aee 100644 --- a/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvUserProductDao.xml @@ -232,10 +232,11 @@ group by ipd.orderId - 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 = '') diff --git a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml index 8c2e9238a..5211a5d5a 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml @@ -357,11 +357,13 @@ group by ipd.orderId - 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 = '') +