|
@@ -160,22 +160,24 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
|
|
|
List<OutStoreDetailVO> outStoreDetailVOS=vo.getDetailList();
|
|
|
//待出库
|
|
|
if(vo.getStatus()!=null&&vo.getStatus().equals(OutStoreStatusEnum.NOT_EXECUTE)){
|
|
|
- for(OutStoreDetailVO vo1:outStoreDetailVOS){
|
|
|
- num1+=vo1.getNum().intValue();
|
|
|
- if(vo1.getType()==OutStoreTypeEnum.CHUKU_LINGYONG.getValue()){
|
|
|
- lyNum+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- if(vo1.getType()==OutStoreTypeEnum.CHUKU_DIAOBO.getValue()){
|
|
|
- dbNum2+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- if(vo1.getType()==OutStoreTypeEnum.CHUKU_BAOFEI.getValue()){
|
|
|
- bfNum+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- if(vo1.getType()==OutStoreTypeEnum.CHUKU_QITA.getValue()){
|
|
|
- otherNum2+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- if(vo1.getType()==OutStoreTypeEnum.STORE_CHECK.getValue()){
|
|
|
- pdNum+=vo1.getNum().intValue();
|
|
|
+ if(outStoreDetailVOS!=null) {
|
|
|
+ for (OutStoreDetailVO vo1 : outStoreDetailVOS) {
|
|
|
+ num1 += vo1.getNum().intValue();
|
|
|
+ if (vo1.getType() == OutStoreTypeEnum.CHUKU_LINGYONG.getValue()) {
|
|
|
+ lyNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ if (vo1.getType() == OutStoreTypeEnum.CHUKU_DIAOBO.getValue()) {
|
|
|
+ dbNum2 += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ if (vo1.getType() == OutStoreTypeEnum.CHUKU_BAOFEI.getValue()) {
|
|
|
+ bfNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ if (vo1.getType() == OutStoreTypeEnum.CHUKU_QITA.getValue()) {
|
|
|
+ otherNum2 += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ if (vo1.getType() == OutStoreTypeEnum.STORE_CHECK.getValue()) {
|
|
|
+ pdNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -184,22 +186,24 @@ public class InStoreFormServiceImpl extends BaseServiceImpl<InStoreFormMapper, I
|
|
|
List<InStoreDetailVO> inStoreDetailVOS=vo.getDetailList();
|
|
|
//待入库数据
|
|
|
if(vo.getStatus()!=null&&vo.getStatus().equals(InStoreStatusEnum.NOT_EXECUTE.getValue())){
|
|
|
- for (InStoreDetailVO vo1:inStoreDetailVOS){
|
|
|
- num+=vo1.getNum().intValue();
|
|
|
- //采购
|
|
|
- if(vo1.getType()==InStoreTypeEnum.CAIGOU_RUKU.getValue()){
|
|
|
- purchaseNum+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- //闲置入库
|
|
|
- if(vo1.getType()==InStoreTypeEnum.XIANZHI_RUKU.getValue()){
|
|
|
- xzNum+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- //调拨入库
|
|
|
- if(vo1.getType()==InStoreTypeEnum.DIAOBO_RUKU.getValue()){
|
|
|
- dbNum+=vo1.getNum().intValue();
|
|
|
- }
|
|
|
- if(vo1.getType()==InStoreTypeEnum.FAYUN_RUKU.getValue()||vo1.getType()==InStoreTypeEnum.STORE_CHECK.getValue()){
|
|
|
- otherNum+=vo1.getNum().intValue();
|
|
|
+ if(inStoreDetailVOS!=null) {
|
|
|
+ for (InStoreDetailVO vo1 : inStoreDetailVOS) {
|
|
|
+ num += vo1.getNum().intValue();
|
|
|
+ //采购
|
|
|
+ if (vo1.getType() == InStoreTypeEnum.CAIGOU_RUKU.getValue()) {
|
|
|
+ purchaseNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ //闲置入库
|
|
|
+ if (vo1.getType() == InStoreTypeEnum.XIANZHI_RUKU.getValue()) {
|
|
|
+ xzNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ //调拨入库
|
|
|
+ if (vo1.getType() == InStoreTypeEnum.DIAOBO_RUKU.getValue()) {
|
|
|
+ dbNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
+ if (vo1.getType() == InStoreTypeEnum.FAYUN_RUKU.getValue() || vo1.getType() == InStoreTypeEnum.STORE_CHECK.getValue()) {
|
|
|
+ otherNum += vo1.getNum().intValue();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|