diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java index d5b5fa68..431fb9b6 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/ErrorCodeConstants.java @@ -940,7 +940,6 @@ public interface ErrorCodeConstants { ErrorCode UNPLANNEDISSUE_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_143_000, "计划外出库申请主不存在"); ErrorCode UNPLANNEDISSUE_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_143_001, "计划外出库申请子不存在"); ErrorCode UNPLANNEDISSUE_REQUEST_DETAIL_LOCALTIONCODE_NOT_EXISTS = new ErrorCode(1_000_143_002, "库位【{}】无效"); - ErrorCode UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS = new ErrorCode(1_000_143_003, "库存余额不存在"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_143_004, "计划外出库申请状态不支持关闭"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_RE_ADD = new ErrorCode(1_000_143_005, "计划外出库申请状态不支持关闭"); ErrorCode UNPLANNEDISSUE_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_143_006, "计划外出库申请状态不支持提交"); @@ -1040,6 +1039,7 @@ public interface ErrorCodeConstants { ErrorCode COUNTADJUST_REQUEST_MAIN_NOT_EXISTS = new ErrorCode(1_000_156_000, "盘点调整申请主不存在"); ErrorCode COUNTADJUST_REQUEST_DETAIL_NOT_EXISTS = new ErrorCode(1_000_156_001, "盘点调整申请子不存在"); ErrorCode COUNTADJUST_REQUEST_EXISTS = new ErrorCode(1_000_156_001, "不能生成盘点调整"); + ErrorCode COUNTADJUST_REQUEST_THAW = new ErrorCode(1_000_156_001, "不能解冻"); ErrorCode COUNTADJUST_REQUEST_RECORD_EXISTS = new ErrorCode(1_000_078_003, "盘点调整申请存在盘点调整记录单"); ErrorCode COUNTADJUST_REQUEST_CANNOT_CLOSE = new ErrorCode(1_000_078_004, "盘点调整申请状态不支持关闭"); ErrorCode COUNTADJUST_REQUEST_CANNOT_SUBMIT = new ErrorCode(1_000_078_005, "盘点调整申请状态不支持提交"); @@ -1065,6 +1065,7 @@ public interface ErrorCodeConstants { ErrorCode BALANCE_ITEM_NOT_EXISTS = new ErrorCode(1_000_163_001, "查询库存余额 物品不能为空"); ErrorCode BALANCE_STATU_NOT_EXISTS = new ErrorCode(1_000_163_002, "查询库存余额 库存状态不能为空"); ErrorCode BALANCE_QTY_NOT_EXISTS = new ErrorCode(1_000_163_003, "查询库存余额 数量不能为空"); + ErrorCode BALANCE_FROZEN = new ErrorCode(1_000_163_003, "库存余额已经被冻结"); //库存事务ErrorCode ErrorCode TRANSACTION_NOT_EXISTS = new ErrorCode(1_000_164_000, "库存事务不存在"); //库存事务ErrorCode diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java index 6af60032..4da4926a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java @@ -258,4 +258,13 @@ public class CountRequestMainController { return success(count > 0); } + @PutMapping("/thaw") + @Operation(summary = "解冻") + @Parameter(name = "id", description = "编号", required = true) + @PreAuthorize("@ss.hasPermission('wms:count-request-main:thaw')") + public CommonResult thaw(@RequestParam("id") Long id) { + int count = countRequestMainService.thaw(id); + return success(count > 0); + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java index afe694ea..cf06a57a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java @@ -1,9 +1,7 @@ package com.win.module.wms.dal.mysql.balance; import cn.hutool.json.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; @@ -16,7 +14,6 @@ import com.win.module.wms.controller.balance.vo.BalancePageReqVO; import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.balance.BalanceConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.enums.inventoryAction.InventoryActionEnum; import org.apache.ibatis.annotations.Mapper; @@ -24,7 +21,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.util.List; -import static com.win.module.wms.enums.ErrorCodeConstants.LOCATION_DISABLE_NEGATIVE; +import static com.win.module.wms.enums.ErrorCodeConstants.*; /** * 库存余额 Mapper @@ -50,6 +47,9 @@ public interface BalanceMapper extends BaseMapperX { balanceDO = BalanceConvert.INSTANCE.convert(reqVO); result = this.insert(balanceDO); } else {//存在只更新数量 + if(balanceDO.getFrozen().equals("TRUE")) { + throw new ServiceException(BALANCE_FROZEN); + } BigDecimal qtyNew = reqVO.getQty(); BigDecimal amountNew = BigDecimal.ZERO; if(reqVO.getAmount() != null){ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java index f92e6b91..b9a4a4d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/countRecord/CountRecordDetailMapper.java @@ -104,4 +104,11 @@ public interface CountRecordDetailMapper extends BaseMapperX getDifferenceList(@Param("requestNumber") String requestNumber); + + /** + * 查询申请单号下盘平的数量 + * @param requestNumber 申请单号 + * @return 盘平数量 + */ + List getSameList(@Param("requestNumber") String requestNumber); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 05919295..0ee96d90 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -39,7 +39,7 @@ import java.util.Map; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; /** * 库存余额 Service 实现类 @@ -189,7 +189,7 @@ public class BalanceServiceImpl implements BalanceService { private BalanceDO validateBalanceExists(Long id) { BalanceDO balanceDO = balanceMapper.selectById(id); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } return balanceDO; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java index 802d5665..e990ede2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java @@ -248,7 +248,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { long differenceCount = countRecordDetailMapper.getDifferenceCount(countRequestMainDO.getNumber()); //生成盘点调整状态1不可生成2可生成3已生成4不需要生成 if(differenceCount == 0) {//全部盘平 - countRequestMainDO.setCountAdjustStatus("4"); + countRequestMainDO.setCountAdjustStatus("3"); } else { countRequestMainDO.setCountAdjustStatus("2"); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java index ff31b18b..3a557506 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java @@ -367,6 +367,10 @@ public class CountPlanMainServiceImpl implements CountPlanMainService { countRequestDetailCreateReqVO.setItemDesc1(itembasicDO.getDesc1()); countRequestDetailCreateReqVO.setItemDesc2(itembasicDO.getDesc2()); subSet.add(countRequestDetailCreateReqVO); + //冻结库存 + if(mainDO.getIsFreeze().equals("TRUE")) { + balanceDO.setFrozen("TRUE"); + } } List subList = new ArrayList<>(); int countDetailNumber = 1; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java index 6f353ce5..99d6713e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainService.java @@ -136,4 +136,11 @@ public interface CountRequestMainService { * @return 更新数量 */ int generateCountadjustRequest(Long countRequestMainId); + + /** + * 根据盘点记录生成库存调整申请 + * @param countRequestMainId 盘点申请id + * @return 更新数量 + */ + int thaw(Long countRequestMainId); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java index 68409278..f5e959e7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java @@ -15,6 +15,7 @@ import com.win.module.wms.convert.countJob.CountJobDetailConvert; import com.win.module.wms.convert.countJob.CountJobMainConvert; import com.win.module.wms.convert.countRequest.CountRequestDetailConvert; import com.win.module.wms.convert.countRequest.CountRequestMainConvert; +import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.countJob.CountJobDetailDO; import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; @@ -29,6 +30,7 @@ import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; +import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.countJob.CountJobDetailMapper; import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; import com.win.module.wms.dal.mysql.countPlan.CountPlanDetailMapper; @@ -107,6 +109,8 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { private CountadjustRequestMainMapper countadjustRequestMainMapper; @Resource private CountadjustRequestDetailMapper countadjustRequestDetailMapper; + @Resource + private BalanceMapper balanceMapper; @Override @Transactional @@ -488,10 +492,46 @@ public class CountRequestMainServiceImpl implements CountRequestMainService { countadjustRequestDetailDO.setNumber(adjustNumber); } countadjustRequestDetailMapper.insertBatch(countadjustRequestDetailDOList); - countRequestMainDO.setCountAdjustStatus("3"); + countRequestMainDO.setCountAdjustStatus("4"); countRequestMainMapper.updateById(countRequestMainDO); trendsApi.createTrends(countadjustRequestMainDO.getId(), "countadjustRequest", "生成了盘点调整申请", TrendsTypeEnum.CREATE); } + //所有盘平的解冻 + List countRecordDetailDOSameList = countRecordDetailMapper.getSameList(countRequestMainDO.getNumber()); + for(CountRecordDetailDO countRecordDetailDO : countRecordDetailDOSameList) { + BalanceDO balanceDO = balanceMapper.getBalanceQty(countRecordDetailDO.getPackingNumber(), countRecordDetailDO.getItemCode(), countRecordDetailDO.getBatch(), countRecordDetailDO.getInventoryStatus(), countRecordDetailDO.getLocationCode()); + if(balanceDO == null) { + throw exception(BALANCE_NOT_EXISTS); + } + if(balanceDO.getFrozen().equals("TRUE")) { + balanceDO.setFrozen("FALSE"); + balanceMapper.updateById(balanceDO); + } + } + return result; + } + + @Override + public int thaw(Long countRequestMainId) { + CountRequestMainDO countRequestMainDO = countRequestMainMapper.selectById(countRequestMainId); + if(!"3".equals(countRequestMainDO.getCountAdjustStatus())) { + throw new ServiceException(COUNTADJUST_REQUEST_THAW); + } + int result = 0; + //所有盘平的解冻 + List countRecordDetailDOSameList = countRecordDetailMapper.getSameList(countRequestMainDO.getNumber()); + for(CountRecordDetailDO countRecordDetailDO : countRecordDetailDOSameList) { + BalanceDO balanceDO = balanceMapper.getBalanceQty(countRecordDetailDO.getPackingNumber(), countRecordDetailDO.getItemCode(), countRecordDetailDO.getBatch(), countRecordDetailDO.getInventoryStatus(), countRecordDetailDO.getLocationCode()); + if(balanceDO == null) { + throw exception(BALANCE_NOT_EXISTS); + } + if(balanceDO.getFrozen().equals("TRUE")) { + balanceDO.setFrozen("FALSE"); + result += balanceMapper.updateById(balanceDO); + } + } + countRequestMainDO.setCountAdjustStatus("4"); + countRequestMainMapper.updateById(countRequestMainDO); return result; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java index 205a13a2..c38406cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countadjustRequest/CountadjustRequestMainServiceImpl.java @@ -205,7 +205,7 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain //添加库存事务list BalanceDO balanceDO = balanceMapper.getBalanceQty(countadjustRecordDetailCreateReqVO.getPackingNumber(), countadjustRecordDetailCreateReqVO.getItemCode(), countadjustRecordDetailCreateReqVO.getBatch(), countadjustRecordDetailCreateReqVO.getInventoryStatus(), countadjustRecordDetailCreateReqVO.getLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); BeanUtils.copyProperties(countadjustRecordDetailCreateReqVO, transactionCreateReqVO); @@ -237,6 +237,11 @@ public class CountadjustRequestMainServiceImpl implements CountadjustRequestMain transactionCreateReqVO.setWorker(String.valueOf(getLoginUserId())); transactionCreateReqVO.setPackingNumber(countadjustRecordDetailCreateReqVO.getPackingNumber()); transactionCreateReqVOList.add(transactionCreateReqVO); + //解冻 + if(balanceDO.getFrozen().equals("TRUE")) { + balanceDO.setFrozen("FALSE"); + balanceMapper.updateById(balanceDO); + } } //增加库存事务 transactionService.createTransaction(transactionCreateReqVOList); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java index 13ed8ba3..b4ee1ed9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java @@ -256,7 +256,7 @@ public class InspectJobMainServiceImpl implements InspectJobMainService { //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(inspectJobDetailUpdateReqVO.getPackingNumber(), inspectJobMainUpdateReqVO.getItemCode(), inspectJobMainUpdateReqVO.getBatch(), inspectJobDetailUpdateReqVO.getInventoryStatus(), inspectJobDetailUpdateReqVO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务入list TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java index 41b5b25f..fcb6ad5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/issueRecord/IssueRecordMainServiceImpl.java @@ -1,6 +1,7 @@ package com.win.module.wms.service.issueRecord; import com.win.framework.common.pojo.CustomConditions; +import com.win.framework.common.pojo.PageResult; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; @@ -13,15 +14,18 @@ import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainPageReqVO; import com.win.module.wms.controller.issueRecord.vo.IssueRecordMainUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.issueRecord.IssueRecordDetailConvert; +import com.win.module.wms.convert.issueRecord.IssueRecordMainConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO; +import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.issueRecord.IssueRecordDetailMapper; +import com.win.module.wms.dal.mysql.issueRecord.IssueRecordMainMapper; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.recordsetting.RecordsettingService; @@ -29,20 +33,14 @@ import com.win.module.wms.service.transaction.TransactionService; import com.win.module.wms.util.JobUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; - import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; -import java.math.BigDecimal; +import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.*; - -import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordMainDO; -import com.win.framework.common.pojo.PageResult; - -import com.win.module.wms.convert.issueRecord.IssueRecordMainConvert; -import com.win.module.wms.dal.mysql.issueRecord.IssueRecordMainMapper; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; @@ -140,7 +138,7 @@ public class IssueRecordMainServiceImpl implements IssueRecordMainService { //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } // 库存事务——入 TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java index 484f5dc0..0701a0c0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productdismantleRecord/ProductdismantleRecordMainServiceImpl.java @@ -16,18 +16,14 @@ import com.win.module.wms.controller.productdismantleRecord.vo.ProductdismantleR import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordDetailaConvert; import com.win.module.wms.convert.productdismantleRecord.ProductdismantleRecordMainConvert; -import com.win.module.wms.convert.repleinshRecord.RepleinshRecordDetailConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailaDO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordDetailbDO; import com.win.module.wms.dal.dataobject.productdismantleRecord.ProductdismantleRecordMainDO; -import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailaDO; import com.win.module.wms.dal.dataobject.productdismantleRequest.ProductdismantleRequestDetailbDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; -import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.dataobject.workstation.WorkstationDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; @@ -47,7 +43,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; @@ -55,7 +50,8 @@ import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.*; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.PRODUCTDISMANTLE_RECORD_MAIN_NOT_EXISTS; /** * 制品拆解记录主 Service 实现类 @@ -133,7 +129,7 @@ public class ProductdismantleRecordMainServiceImpl implements ProductdismantleRe //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(productdismantleRecordDetailaDO.getPackingNumber(), productdismantleRecordDetailaDO.getItemCode(), productdismantleRecordDetailaDO.getBatch(), productdismantleRecordDetailaDO.getInventoryStatus(), productdismantleRecordDetailaDO.getFromLocationCode()); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } //添加库存事务list // 出动作 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java index 181157ab..e056f6c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java @@ -13,19 +13,15 @@ import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnR import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainPageReqVO; import com.win.module.wms.controller.productionreturnRecord.vo.ProductionreturnRecordMainUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; -import com.win.module.wms.convert.issueRecord.IssueRecordDetailConvert; import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordDetailConvert; import com.win.module.wms.convert.productionreturnRecord.ProductionreturnRecordMainConvert; -import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO; import com.win.module.wms.dal.dataobject.balance.BalanceDO; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; -import com.win.module.wms.dal.dataobject.issueRecord.IssueRecordDetailDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.location.LocationDO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordDetailDO; import com.win.module.wms.dal.dataobject.productionreturnRecord.ProductionreturnRecordMainDO; import com.win.module.wms.dal.dataobject.recordsetting.RecordsettingDO; -import com.win.module.wms.dal.dataobject.repleinshRecord.RepleinshRecordDetailDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.productionreturnRecord.ProductionreturnRecordDetailMapper; @@ -160,8 +156,8 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe List status = new ArrayList<>(); status.add(detailDO.getInventoryStatus()); List balanceDOList = balanceService.selectNumber(detailDO.getItemCode(),status,detailDO.getFromLocationCode()); - if (balanceDOList == null || balanceDOList.size() == 0) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + if (balanceDOList == null || balanceDOList.isEmpty()) { + throw exception(BALANCE_NOT_EXISTS); } // balanceDOList.get(0) 线边库 管理模式为 数量管理 库存余额应该就是一个 // 退料总数量 大于 库存余额数量 返回 错误信息 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java index d612e5b1..68497cd2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productputawayRecord/ProductputawayRecordMainServiceImpl.java @@ -37,7 +37,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; @@ -138,7 +137,7 @@ public class ProductputawayRecordMainServiceImpl implements ProductputawayRecord //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } // 库存事务——入 TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java index 7df9b1ca..ee7753eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptJob/ProductreceiptJobMainServiceImpl.java @@ -478,7 +478,7 @@ public class ProductreceiptJobMainServiceImpl implements ProductreceiptJobMainSe //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(productreceiptRecordDetailDO.getPackingNumber(), productreceiptRecordDetailDO.getItemCode(), productreceiptRecordDetailDO.getBatch(), productreceiptRecordDetailDO.getInventoryStatus(), productreceiptRecordDetailDO.getToLocationCode()); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } //添加库存事务list // 出动作 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java index 29d1a0df..10942630 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productreceiptRecord/ProductreceiptRecordMainServiceImpl.java @@ -136,7 +136,7 @@ public class ProductreceiptRecordMainServiceImpl implements ProductreceiptRecord //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getPackingNumber(), detailDO.getItemCode(), detailDO.getBatch(), detailDO.getInventoryStatus(), detailDO.getToLocationCode()); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } // 库存事务——入 TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java index fb7e8d59..bd88b757 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java @@ -268,7 +268,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(purchasereturnRecordDetailDO.getFromPackingNumber(), purchasereturnRecordDetailDO.getItemCode(), purchasereturnRecordDetailDO.getFromBatch(), purchasereturnRecordDetailDO.getInventoryStatus(), purchasereturnRecordDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java index 709df7e8..bed1e424 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRecord/PurchasereturnRecordMainServiceImpl.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.List; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; /** * 采购退货记录主 Service 实现类 @@ -94,7 +94,7 @@ public class PurchasereturnRecordMainServiceImpl implements PurchasereturnRecord //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务出list TransactionCreateReqVO transactionCreateReqVOOut = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java index 70666724..b6caba61 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRecord/PutawayRecordMainServiceImpl.java @@ -35,7 +35,7 @@ import java.util.ArrayList; import java.util.List; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; /** * 上架记录主 Service 实现类 @@ -92,7 +92,7 @@ public class PutawayRecordMainServiceImpl implements PutawayRecordMainService { //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //增加业务入类型 transactionCreateReqVOIn.setBusinessType(businesstypeDO.getCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java index 71601898..1a7cec55 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/repleinshRecord/RepleinshRecordMainServiceImpl.java @@ -139,7 +139,7 @@ public class RepleinshRecordMainServiceImpl implements RepleinshRecordMainServic //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); if (balanceDO == null) { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } // 库存事务——入 TransactionCreateReqVO transactionCreateReqVOIn = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java index 3a0805ee..bf1ef1b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java @@ -36,8 +36,8 @@ import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; import static com.win.module.wms.enums.ErrorCodeConstants.SCRAP_RECORD_MAIN_NOT_EXISTS; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; /** * 报废出库记录主 Service 实现类 @@ -103,7 +103,7 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService { //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java index 6fab38d0..49b2a4be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueJob/TransferissueJobMainServiceImpl.java @@ -322,7 +322,7 @@ public class TransferissueJobMainServiceImpl implements TransferissueJobMainServ //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(transferissueJobDetailDO.getPackingNumber(), transferissueJobDetailDO.getItemCode(), transferissueJobDetailDO.getBatch(), transferissueJobDetailDO.getInventoryStatus(), transferissueJobDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java index dc56a034..fccb3d99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRecord/TransferissueRecordMainServiceImpl.java @@ -29,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; -import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Collection; @@ -37,8 +36,8 @@ import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERISSUE_RECORD_MAIN_NOT_EXISTS; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; /** * 调拨出库记录主 Service 实现类 @@ -106,7 +105,7 @@ public class TransferissueRecordMainServiceImpl implements TransferissueRecordMa //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getFromPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getFromBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java index 5471187c..7c10712c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferissueRequest/TransferissueRequestMainServiceImpl.java @@ -633,7 +633,7 @@ public class TransferissueRequestMainServiceImpl implements TransferissueRequest //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(transferissueRecordDetailDO.getFromPackingNumber(), transferissueRecordDetailDO.getItemCode(), transferissueRecordDetailDO.getFromBatch(), transferissueRecordDetailDO.getInventoryStatus(), transferissueRecordDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java index 9c05c040..4c4f24c4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRecord/TransferreceiptRecordMainServiceImpl.java @@ -37,7 +37,7 @@ import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static com.win.module.wms.enums.ErrorCodeConstants.TRANSFERRECEIPT_RECORD_MAIN_NOT_EXISTS; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; /** * 调拨入库记录主 Service 实现类 @@ -106,7 +106,7 @@ public class TransferreceiptRecordMainServiceImpl implements TransferreceiptReco //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getFromPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getFromBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java index 89822117..39fff963 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/transferreceiptRequest/TransferreceiptRequestMainServiceImpl.java @@ -172,7 +172,7 @@ public class TransferreceiptRequestMainServiceImpl implements TransferreceiptReq //添加库存事务list BalanceDO balanceDO = balanceMapper.getBalanceQty(transferreceiptRequestDetailDO.getPackingNumber(), transferreceiptRequestDetailDO.getItemCode(), transferreceiptRequestDetailDO.getBatch(), transferreceiptRequestDetailDO.getInventoryStatus(), transferreceiptRequestDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); BeanUtils.copyProperties(transferreceiptRecordDetailDO, transactionCreateReqVO); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java index 2e58542f..5b323204 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java @@ -37,7 +37,7 @@ import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_RECORD_MAIN_NOT_EXISTS; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; /** * 计划外出库记录主 Service 实现类 @@ -107,7 +107,7 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getFromLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java index 238f0696..797f74cf 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java @@ -282,7 +282,7 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque // BalanceDO balanceDO = balanceDOList.get(0); // 子表不存在赋值字段字段 }else { - throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw exception(BALANCE_NOT_EXISTS); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java index bac7b0f9..814acfe3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java @@ -36,7 +36,7 @@ import java.util.List; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; -import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS; +import static com.win.module.wms.enums.ErrorCodeConstants.BALANCE_NOT_EXISTS; import static com.win.module.wms.enums.ErrorCodeConstants.UNPLANNEDRECEIPT_RECORD_MAIN_NOT_EXISTS; /** @@ -111,7 +111,7 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe //查询库存余额 BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getToLocationCode()); if(balanceDO == null) { - throw new ServiceException(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); + throw new ServiceException(BALANCE_NOT_EXISTS); } //添加库存事务list TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO(); diff --git a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml index 3c721a79..cc65f92c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml +++ b/win-module-wms/win-module-wms-biz/src/main/resources/mapper/countRecord/CountRecordDetailMapper.xml @@ -20,4 +20,13 @@ ) d2 WHERE d1.master_id=d2.master_id AND d1.count_detail_number=d2.count_detail_number AND d1.create_time=d2.create_time AND d1.qty!=d1.count_qty + + +