|
@@ -285,7 +285,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsChangeapplyitem.setChangeapplyitemType(wmsStockAddReqVo.getGoodsType());
|
|
wmsChangeapplyitem.setChangeapplyitemType(wmsStockAddReqVo.getGoodsType());
|
|
|
wmsChangeapplyitem.setChangeapplyitemUnit(wmsStockAddReqVo.getGoodsUnit());
|
|
wmsChangeapplyitem.setChangeapplyitemUnit(wmsStockAddReqVo.getGoodsUnit());
|
|
|
wmsChangeapplyitem.setChangeapplyitemSpec(wmsStockAddReqVo.getGoodsSpec());
|
|
wmsChangeapplyitem.setChangeapplyitemSpec(wmsStockAddReqVo.getGoodsSpec());
|
|
|
- if (wmsStockAddReqVo.getStockAmount().compareTo(new BigDecimal("0")) == 0) {
|
|
|
|
|
|
|
+ if (wmsStockAddReqVo.getStockAmount().compareTo(new BigDecimal(CommonEnums.WMS_STOCK_AMOUNT_CHANGE_MIN.getCode())) == 0) {
|
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
|
}
|
|
}
|
|
|
wmsChangeapplyitem.setChangeapplyitemNum(wmsStockAddReqVo.getStockAmount());
|
|
wmsChangeapplyitem.setChangeapplyitemNum(wmsStockAddReqVo.getStockAmount());
|
|
@@ -313,7 +313,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsChangeapplyitem.setChangeapplyitemType(wmsStockBatchChangeReqVoItem.getGoodsType());
|
|
wmsChangeapplyitem.setChangeapplyitemType(wmsStockBatchChangeReqVoItem.getGoodsType());
|
|
|
wmsChangeapplyitem.setChangeapplyitemUnit(wmsStockBatchChangeReqVoItem.getGoodsUnit());
|
|
wmsChangeapplyitem.setChangeapplyitemUnit(wmsStockBatchChangeReqVoItem.getGoodsUnit());
|
|
|
wmsChangeapplyitem.setChangeapplyitemSpec(wmsStockBatchChangeReqVoItem.getGoodsSpec());
|
|
wmsChangeapplyitem.setChangeapplyitemSpec(wmsStockBatchChangeReqVoItem.getGoodsSpec());
|
|
|
- if (wmsStockBatchChangeReqVoItem.getStockAmount().compareTo(new BigDecimal("0")) == 0) {
|
|
|
|
|
|
|
+ if (wmsStockBatchChangeReqVoItem.getStockAmount().compareTo(new BigDecimal(CommonEnums.WMS_STOCK_AMOUNT_CHANGE_MIN.getCode())) == 0) {
|
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
|
}
|
|
}
|
|
|
wmsChangeapplyitem.setChangeapplyitemNum(wmsStockBatchChangeReqVoItem.getStockAmount());
|
|
wmsChangeapplyitem.setChangeapplyitemNum(wmsStockBatchChangeReqVoItem.getStockAmount());
|
|
@@ -340,7 +340,7 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
wmsChange.setChangeWay(ChangeWay.IN.getCode());
|
|
wmsChange.setChangeWay(ChangeWay.IN.getCode());
|
|
|
wmsChange.setChangeNum(wmsStock.getStockAmount());
|
|
wmsChange.setChangeNum(wmsStock.getStockAmount());
|
|
|
wmsChange.setChangeOldnum(new BigDecimal("0"));
|
|
wmsChange.setChangeOldnum(new BigDecimal("0"));
|
|
|
- if (wmsStock.getStockAmount().compareTo(new BigDecimal("0")) == 0) {
|
|
|
|
|
|
|
+ if (wmsStock.getStockAmount().compareTo(new BigDecimal(CommonEnums.WMS_STOCK_AMOUNT_CHANGE_MIN.getCode())) == 0) {
|
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
|
}
|
|
}
|
|
|
wmsChange.setChangeNewnum(wmsStock.getStockAmount());
|
|
wmsChange.setChangeNewnum(wmsStock.getStockAmount());
|
|
@@ -363,14 +363,17 @@ public class WmsStockServiceImpl implements IWmsStockService {
|
|
|
if (ChangeBizType.RECEIPTS_APPLY.equal(wmsStockBatchChangeReqVo.getChangeBiztype())) {
|
|
if (ChangeBizType.RECEIPTS_APPLY.equal(wmsStockBatchChangeReqVo.getChangeBiztype())) {
|
|
|
wmsChange.setChangeWay(ChangeWay.IN.getCode());
|
|
wmsChange.setChangeWay(ChangeWay.IN.getCode());
|
|
|
wmsChange.setChangeNewnum(wmsStock.getStockAmount().add(wmsChangeapplyitem.getChangeapplyitemNum()));
|
|
wmsChange.setChangeNewnum(wmsStock.getStockAmount().add(wmsChangeapplyitem.getChangeapplyitemNum()));
|
|
|
|
|
+ if(wmsChange.getChangeNewnum().compareTo(new BigDecimal(CommonEnums.WMS_STOCK_AMOUNT_MAX.getCode()))>0){
|
|
|
|
|
+ throw new BizException(ErrorCode.WMS_STOCK_OVERFLOW);
|
|
|
|
|
+ }
|
|
|
} else {
|
|
} else {
|
|
|
wmsChange.setChangeWay(ChangeWay.OUT.getCode());
|
|
wmsChange.setChangeWay(ChangeWay.OUT.getCode());
|
|
|
wmsChange.setChangeNewnum(wmsStock.getStockAmount().subtract(wmsChangeapplyitem.getChangeapplyitemNum()));
|
|
wmsChange.setChangeNewnum(wmsStock.getStockAmount().subtract(wmsChangeapplyitem.getChangeapplyitemNum()));
|
|
|
- if (wmsChange.getChangeNewnum().compareTo(new BigDecimal("0")) < 0) {
|
|
|
|
|
|
|
+ if (wmsChange.getChangeNewnum().compareTo(new BigDecimal(CommonEnums.WMS_STOCK_AMOUNT_MIN.getCode())) < 0) {
|
|
|
throw new BizException(ErrorCode.WMS_STOCK_NOT_ENOUGH);
|
|
throw new BizException(ErrorCode.WMS_STOCK_NOT_ENOUGH);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (wmsChangeapplyitem.getChangeapplyitemNum().compareTo(new BigDecimal("0")) == 0) {
|
|
|
|
|
|
|
+ if (wmsChangeapplyitem.getChangeapplyitemNum().compareTo(new BigDecimal(CommonEnums.WMS_STOCK_AMOUNT_CHANGE_MIN.getCode())) == 0) {
|
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
throw new BizException(ErrorCode.WMS_STOCK_CANNOT_CHANGE_ZERO);
|
|
|
}
|
|
}
|
|
|
|
|
|