|
@ -18,14 +18,10 @@ import com.win.module.wms.dal.dataobject.countJob.CountJobMainDO; |
|
|
import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; |
|
|
import com.win.module.wms.dal.dataobject.countRecord.CountRecordDetailDO; |
|
|
import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO; |
|
|
import com.win.module.wms.dal.dataobject.countRecord.CountRecordMainDO; |
|
|
import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; |
|
|
import com.win.module.wms.dal.dataobject.countRequest.CountRequestMainDO; |
|
|
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestDetailDO; |
|
|
|
|
|
import com.win.module.wms.dal.dataobject.countadjustRequest.CountadjustRequestMainDO; |
|
|
|
|
|
import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; |
|
|
import com.win.module.wms.dal.mysql.countJob.CountJobMainMapper; |
|
|
import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper; |
|
|
import com.win.module.wms.dal.mysql.countRecord.CountRecordDetailMapper; |
|
|
import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper; |
|
|
import com.win.module.wms.dal.mysql.countRecord.CountRecordMainMapper; |
|
|
import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper; |
|
|
import com.win.module.wms.dal.mysql.countRequest.CountRequestMainMapper; |
|
|
import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestDetailMapper; |
|
|
|
|
|
import com.win.module.wms.dal.mysql.countadjustRequest.CountadjustRequestMainMapper; |
|
|
|
|
|
import com.win.module.wms.enums.job.JobStatusEnum; |
|
|
import com.win.module.wms.enums.job.JobStatusEnum; |
|
|
import com.win.module.wms.enums.job.JobStatusState; |
|
|
import com.win.module.wms.enums.job.JobStatusState; |
|
|
import com.win.module.wms.enums.request.RequestStatusEnum; |
|
|
import com.win.module.wms.enums.request.RequestStatusEnum; |
|
@ -64,10 +60,6 @@ public class CountJobMainServiceImpl implements CountJobMainService { |
|
|
private SerialNumberApi serialNumberApi; |
|
|
private SerialNumberApi serialNumberApi; |
|
|
@Resource |
|
|
@Resource |
|
|
private CountRequestMainMapper countRequestMainMapper; |
|
|
private CountRequestMainMapper countRequestMainMapper; |
|
|
@Resource |
|
|
|
|
|
private CountadjustRequestMainMapper countadjustRequestMainMapper; |
|
|
|
|
|
@Resource |
|
|
|
|
|
private CountadjustRequestDetailMapper countadjustRequestDetailMapper; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public CountJobMainDO getCountJobMain(Long id) { |
|
|
public CountJobMainDO getCountJobMain(Long id) { |
|
@ -178,9 +170,7 @@ public class CountJobMainServiceImpl implements CountJobMainService { |
|
|
countRecordMainDO.setUpdateTime(null); |
|
|
countRecordMainDO.setUpdateTime(null); |
|
|
countRecordMainMapper.insert(countRecordMainDO); |
|
|
countRecordMainMapper.insert(countRecordMainDO); |
|
|
List<CountJobDetailUpdateReqVO> countJobDetailUpdateReqVOList = countJobMainUpdateReqVO.getSubList(); |
|
|
List<CountJobDetailUpdateReqVO> countJobDetailUpdateReqVOList = countJobMainUpdateReqVO.getSubList(); |
|
|
List<CountadjustRequestDetailDO> countadjustRequestDetailDOList = new ArrayList<>(); |
|
|
|
|
|
List<CountRecordDetailDO> countRecordDetailDOList = new ArrayList<>(); |
|
|
List<CountRecordDetailDO> countRecordDetailDOList = new ArrayList<>(); |
|
|
int countDetailNumber = 1; |
|
|
|
|
|
for(CountJobDetailUpdateReqVO countJobDetailUpdateReqVO : countJobDetailUpdateReqVOList) { |
|
|
for(CountJobDetailUpdateReqVO countJobDetailUpdateReqVO : countJobDetailUpdateReqVOList) { |
|
|
CountRecordDetailDO countRecordDetailDO = new CountRecordDetailDO(); |
|
|
CountRecordDetailDO countRecordDetailDO = new CountRecordDetailDO(); |
|
|
BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRecordDetailDO); |
|
|
BeanUtils.copyProperties(countJobDetailUpdateReqVO, countRecordDetailDO); |
|
@ -193,47 +183,8 @@ public class CountJobMainServiceImpl implements CountJobMainService { |
|
|
countRecordDetailDO.setUpdater(null); |
|
|
countRecordDetailDO.setUpdater(null); |
|
|
countRecordDetailDO.setUpdateTime(null); |
|
|
countRecordDetailDO.setUpdateTime(null); |
|
|
countRecordDetailDOList.add(countRecordDetailDO); |
|
|
countRecordDetailDOList.add(countRecordDetailDO); |
|
|
//盘点记录数量不一致时生成盘点调整申请
|
|
|
|
|
|
if(countRecordDetailDO.getCountQty().compareTo(countRecordDetailDO.getQty()) != 0) { |
|
|
|
|
|
CountadjustRequestDetailDO countadjustRequestDetailDO = new CountadjustRequestDetailDO(); |
|
|
|
|
|
BeanUtils.copyProperties(countRecordDetailDO, countadjustRequestDetailDO); |
|
|
|
|
|
countadjustRequestDetailDO.setCountDetailNumber(String.valueOf(countDetailNumber)); |
|
|
|
|
|
countadjustRequestDetailDO.setInventoryQty(countRecordDetailDO.getQty()); |
|
|
|
|
|
countadjustRequestDetailDO.setCountQty(countRecordDetailDO.getCountQty()); |
|
|
|
|
|
//库存数量减盘点数量等于调整数量
|
|
|
|
|
|
countadjustRequestDetailDO.setAdjustQty(countRecordDetailDO.getQty().subtract(countRecordDetailDO.getCountQty())); |
|
|
|
|
|
//调整数量的绝对值
|
|
|
|
|
|
countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs()); |
|
|
|
|
|
countadjustRequestDetailDO.setId(null); |
|
|
|
|
|
countadjustRequestDetailDO.setCreator(null); |
|
|
|
|
|
countadjustRequestDetailDO.setCreateTime(null); |
|
|
|
|
|
countadjustRequestDetailDO.setUpdater(null); |
|
|
|
|
|
countadjustRequestDetailDO.setUpdateTime(null); |
|
|
|
|
|
countadjustRequestDetailDOList.add(countadjustRequestDetailDO); |
|
|
|
|
|
countDetailNumber++; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
countRecordDetailMapper.insertBatch(countRecordDetailDOList); |
|
|
countRecordDetailMapper.insertBatch(countRecordDetailDOList); |
|
|
//增加库存跳转
|
|
|
|
|
|
if(!countadjustRequestDetailDOList.isEmpty()) { |
|
|
|
|
|
CountadjustRequestMainDO countadjustRequestMainDO = new CountadjustRequestMainDO(); |
|
|
|
|
|
BeanUtils.copyProperties(countRecordMainDO, countadjustRequestMainDO); |
|
|
|
|
|
String adjustNumber = serialNumberApi.generateCode(RuleCodeEnum.COUNT_ADJUST_REQUEST.getCode()); |
|
|
|
|
|
countadjustRequestMainDO.setNumber(adjustNumber); |
|
|
|
|
|
countadjustRequestMainDO.setCountRecordNumber(number); |
|
|
|
|
|
countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode()); |
|
|
|
|
|
countadjustRequestMainDO.setId(null); |
|
|
|
|
|
countadjustRequestMainDO.setCreator(null); |
|
|
|
|
|
countadjustRequestMainDO.setCreateTime(null); |
|
|
|
|
|
countadjustRequestMainDO.setUpdater(null); |
|
|
|
|
|
countadjustRequestMainDO.setUpdateTime(null); |
|
|
|
|
|
countadjustRequestMainMapper.insert(countadjustRequestMainDO); |
|
|
|
|
|
for(CountadjustRequestDetailDO countadjustRequestDetailDO : countadjustRequestDetailDOList) { |
|
|
|
|
|
countadjustRequestDetailDO.setMasterId(countadjustRequestMainDO.getId()); |
|
|
|
|
|
countadjustRequestDetailDO.setNumber(adjustNumber); |
|
|
|
|
|
} |
|
|
|
|
|
countadjustRequestDetailMapper.insertBatch(countadjustRequestDetailDOList); |
|
|
|
|
|
} |
|
|
|
|
|
List<String> typeList = new ArrayList<>(); |
|
|
List<String> typeList = new ArrayList<>(); |
|
|
typeList.add(JobStatusEnum.PENDING.getCode()); |
|
|
typeList.add(JobStatusEnum.PENDING.getCode()); |
|
|
typeList.add(JobStatusEnum.PROCESSING.getCode()); |
|
|
typeList.add(JobStatusEnum.PROCESSING.getCode()); |
|
|