|
|
|
@ -1,14 +1,38 @@ |
|
|
|
package com.win.module.wms.service.scrapRequest; |
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil; |
|
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
|
import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainCreateReqVO; |
|
|
|
import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainExportReqVO; |
|
|
|
import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainPageReqVO; |
|
|
|
import com.win.module.wms.controller.scrapRequest.vo.ScrapRequestMainUpdateReqVO; |
|
|
|
import com.win.module.infra.api.trends.TrendsApi; |
|
|
|
import com.win.module.infra.enums.TrendsTypeEnum; |
|
|
|
import com.win.module.system.api.serialnumber.SerialNumberApi; |
|
|
|
import com.win.module.system.enums.serialNumber.RuleCodeEnum; |
|
|
|
import com.win.module.wms.controller.productscrapRequest.vo.*; |
|
|
|
import com.win.module.wms.controller.scrapRequest.vo.*; |
|
|
|
import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestDetailConvert; |
|
|
|
import com.win.module.wms.convert.productscrapRequest.ProductscrapRequestMainConvert; |
|
|
|
import com.win.module.wms.convert.scrapRequest.ScrapRequestDetailConvert; |
|
|
|
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.productscrapRequest.ProductscrapRequestDetailDO; |
|
|
|
import com.win.module.wms.dal.dataobject.productscrapRequest.ProductscrapRequestMainDO; |
|
|
|
import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; |
|
|
|
import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestDetailDO; |
|
|
|
import com.win.module.wms.dal.dataobject.unplannedissueRequest.UnplannedissueRequestDetailDO; |
|
|
|
import com.win.module.wms.dal.dataobject.unplannedreceiptRequest.UnplannedreceiptRequestMainDO; |
|
|
|
import com.win.module.wms.dal.mysql.scrapRequest.ScrapRequestDetailMapper; |
|
|
|
import com.win.module.wms.enums.request.RequestStatusEnum; |
|
|
|
import com.win.module.wms.enums.request.RequestStatusState; |
|
|
|
import com.win.module.wms.service.itembasic.ItembasicService; |
|
|
|
import com.win.module.wms.service.location.LocationService; |
|
|
|
import com.win.module.wms.service.requestsetting.RequestsettingService; |
|
|
|
import com.win.module.wms.util.JobUtils; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
|
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
import com.win.module.wms.dal.dataobject.scrapRequest.ScrapRequestMainDO; |
|
|
|
@ -32,22 +56,127 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { |
|
|
|
@Resource |
|
|
|
private ScrapRequestMainMapper scrapRequestMainMapper; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private ScrapRequestDetailMapper scrapRequestDetailMapper; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private SerialNumberApi serialNumberApi; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private LocationService locationService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private JobUtils jobUtils; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private ItembasicService itembasicService; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private TrendsApi trendsApi; |
|
|
|
|
|
|
|
@Resource |
|
|
|
private RequestsettingService requestsettingService; |
|
|
|
|
|
|
|
@Override |
|
|
|
public Long createScrapRequestMain(ScrapRequestMainCreateReqVO createReqVO) { |
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ScrapRequest"); |
|
|
|
// 插入
|
|
|
|
ScrapRequestMainDO scrapRequestMain = ScrapRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
scrapRequestMainMapper.insert(scrapRequestMain); |
|
|
|
// 返回
|
|
|
|
ScrapRequestMainDO scrapRequestMain = validatorToCreate(createReqVO,requestsettingDO); |
|
|
|
//调用自动执行方法
|
|
|
|
if (RequestStatusEnum.HANDLING.getCode().equals(scrapRequestMain.getStatus())) { |
|
|
|
|
|
|
|
} |
|
|
|
trendsApi.createTrends(requestsettingDO.getId(), "ScrapRequest", "增加了报废出库申请", TrendsTypeEnum.CREATE); |
|
|
|
return scrapRequestMain.getId(); |
|
|
|
} |
|
|
|
|
|
|
|
private ScrapRequestMainDO validatorToCreate(ScrapRequestMainCreateReqVO createReqVO,RequestsettingDO requestsettingDO) { |
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapRequest"); |
|
|
|
ScrapRequestMainDO scrapRequestMainDO = validateMainMethod(createReqVO, businesstypeDO, requestsettingDO); |
|
|
|
List<ScrapRequestDetailCreateReqVO> subList = createReqVO.getSubList(); |
|
|
|
List<ScrapRequestDetailDO> subDOList = ScrapRequestDetailConvert.INSTANCE.convertList03(subList); |
|
|
|
for (ScrapRequestDetailDO scrapRequestDetailDO : subDOList) { |
|
|
|
validateDetailMethod(scrapRequestDetailDO, businesstypeDO, scrapRequestMainDO); |
|
|
|
} |
|
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_CLAIM_RECORD.getCode()); |
|
|
|
scrapRequestMainDO.setNumber(number); |
|
|
|
scrapRequestMainMapper.insert(scrapRequestMainDO); |
|
|
|
for(ScrapRequestDetailDO detailDo : subDOList){ |
|
|
|
detailDo.setMasterId(scrapRequestMainDO.getId()); |
|
|
|
detailDo.setNumber(scrapRequestMainDO.getNumber()); |
|
|
|
} |
|
|
|
scrapRequestDetailMapper.insertBatch(subDOList); |
|
|
|
return scrapRequestMainDO; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void validateDetailMethod(ScrapRequestDetailDO detailDo, BusinesstypeDO businesstypeDO, ScrapRequestMainDO mainDo) { |
|
|
|
ItembasicDO itembasic = validatorItembasic(detailDo.getItemCode()); |
|
|
|
detailDo.setItemDesc1(itembasic.getDesc1()); |
|
|
|
detailDo.setItemDesc2(itembasic.getDesc2()); |
|
|
|
detailDo.setItemName(itembasic.getName()); |
|
|
|
detailDo.setProjectCode(itembasic.getProject()); |
|
|
|
LocationDO locationDO = validatorLocation(detailDo.getFromLocationCode()); |
|
|
|
mainDo.setFromAreaCodes(locationDO.getAreaCode()); |
|
|
|
mainDo.setFromLocationTypes(locationDO.getCode()); |
|
|
|
jobUtils.ifInToLocationType(detailDo.getFromLocationCode(),businesstypeDO); |
|
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
|
mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); |
|
|
|
mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); |
|
|
|
detailDo.setInventoryStatus("SCRAP"); |
|
|
|
String INVENTORY = detailDo.getInventoryStatus(); |
|
|
|
String[] inventory = INVENTORY.split(","); |
|
|
|
List<String> inventorystatus = Arrays.asList(inventory); |
|
|
|
List<BalanceDO> balanceDO = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(),detailDo.getPackingNumber(),detailDo.getBatch(), detailDo.getFromLocationCode(),inventorystatus); |
|
|
|
for(BalanceDO balance: balanceDO){ |
|
|
|
mainDo.setFromWarehouseCode(balance.getWarehouseCode()); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private ScrapRequestMainDO validateMainMethod(ScrapRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) { |
|
|
|
ScrapRequestMainDO mainDo = ScrapRequestMainConvert.INSTANCE.convert(baseVO); |
|
|
|
mainDo.setRequestTime(LocalDateTime.now()); |
|
|
|
validatetime(mainDo.getDueTime()); |
|
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
|
mainDo.setFromLocationTypes(businesstypeDO.getInLocationTypes()); |
|
|
|
mainDo.setFromAreaCodes(businesstypeDO.getInAreaCodes()); |
|
|
|
return mainDo; |
|
|
|
} |
|
|
|
private ScrapRequestMainDO validatorToUpdate(ScrapRequestMainUpdateReqVO updateReqVO, RequestsettingDO requestsettingDO) { |
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapRequest"); |
|
|
|
ScrapRequestMainDO scrapRequestMainDO = validateMainMethod(updateReqVO,businesstypeDO,requestsettingDO); |
|
|
|
//子表校验
|
|
|
|
List<ScrapRequestDetailUpdateReqVO> subList = updateReqVO.getSubList(); |
|
|
|
if(!subList.isEmpty()) { |
|
|
|
List<ScrapRequestDetailDO> subDOList = ScrapRequestDetailConvert.INSTANCE.convertList05(subList); |
|
|
|
for (ScrapRequestDetailDO scrapRequestDetailDO : subDOList) { |
|
|
|
validateDetailMethod(scrapRequestDetailDO, businesstypeDO, scrapRequestMainDO); |
|
|
|
} |
|
|
|
scrapRequestDetailMapper.updateBatch(subDOList); |
|
|
|
} |
|
|
|
scrapRequestMainMapper.updateById(scrapRequestMainDO); |
|
|
|
return scrapRequestMainDO; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public void updateScrapRequestMain(ScrapRequestMainUpdateReqVO updateReqVO) { |
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ScrapRequest"); |
|
|
|
// 校验存在
|
|
|
|
validateScrapRequestMainExists(updateReqVO.getId()); |
|
|
|
// 更新
|
|
|
|
ScrapRequestMainDO updateObj = ScrapRequestMainConvert.INSTANCE.convert(updateReqVO); |
|
|
|
scrapRequestMainMapper.updateById(updateObj); |
|
|
|
ScrapRequestMainDO scrapRequestMainDO = validatorToUpdate(updateReqVO, requestsettingDO); |
|
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(scrapRequestMainDO.getStatus())) { |
|
|
|
|
|
|
|
} |
|
|
|
trendsApi.createTrends(requestsettingDO.getId(), "ScrapRequest", "增加了报废出库申请", TrendsTypeEnum.CREATE); |
|
|
|
} |
|
|
|
@Override |
|
|
|
public PageResult<ScrapRequestMainDO> getScrapRequestMainSenior(CustomConditions conditions) { |
|
|
|
@ -81,10 +210,142 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService { |
|
|
|
public PageResult<ScrapRequestMainDO> getScrapRequestMainPage(ScrapRequestMainPageReqVO pageReqVO) { |
|
|
|
return scrapRequestMainMapper.selectPage(pageReqVO); |
|
|
|
} |
|
|
|
private void validatetime(LocalDateTime durtime){ |
|
|
|
if(LocalDateTime.now().isAfter(durtime)){ |
|
|
|
throw exception(TIME_AFTER,LocalDateTime.now(),durtime); |
|
|
|
} |
|
|
|
} |
|
|
|
private LocationDO validatorLocation(String Location){ |
|
|
|
return locationService.selectLocation(Location); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
public List<ScrapRequestMainDO> getScrapRequestMainList(ScrapRequestMainExportReqVO exportReqVO) { |
|
|
|
return scrapRequestMainMapper.selectList(exportReqVO); |
|
|
|
} |
|
|
|
|
|
|
|
private ItembasicDO validatorItembasic(String itemCode) { |
|
|
|
return itembasicService.selectItembasic(itemCode); |
|
|
|
} |
|
|
|
|
|
|
|
private String validateScrapRequestMainImport(ScrapRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { |
|
|
|
StringBuilder message = new StringBuilder(); |
|
|
|
mainDo.setRequestTime(LocalDateTime.now()); |
|
|
|
try{ |
|
|
|
validatetime(mainDo.getDueTime()); |
|
|
|
} catch (Exception ex) { |
|
|
|
message.append(ex.getMessage()).append(","); |
|
|
|
} |
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ScrapRequest"); |
|
|
|
if (requestsettingDO == null) { |
|
|
|
message.append("未查找到制品报废申请的相关申请设置"); |
|
|
|
} else { |
|
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
|
} |
|
|
|
if (businesstypeDO == null) { |
|
|
|
message.append("根据单据设置未查找到制品报废申请申请的相关业务类型"); |
|
|
|
} else { |
|
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
|
mainDo.setFromLocationTypes(businesstypeDO.getInLocationTypes()); |
|
|
|
mainDo.setFromAreaCodes(businesstypeDO.getInAreaCodes()); |
|
|
|
} |
|
|
|
return message.toString(); |
|
|
|
} |
|
|
|
|
|
|
|
private String validateScrapvRequestDetailImport(ScrapRequestDetailDO detailDo, ScrapRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { |
|
|
|
StringBuilder message = new StringBuilder(); |
|
|
|
try{ |
|
|
|
ItembasicDO itembasic = validatorItembasic(detailDo.getItemCode()); |
|
|
|
detailDo.setItemDesc1(itembasic.getDesc1()); |
|
|
|
detailDo.setItemDesc2(itembasic.getDesc2()); |
|
|
|
detailDo.setItemName(itembasic.getName()); |
|
|
|
detailDo.setProjectCode(itembasic.getProject()); |
|
|
|
} catch (Exception ex) { |
|
|
|
message.append(ex.getMessage()).append(","); |
|
|
|
} |
|
|
|
try{ |
|
|
|
LocationDO locationDO = validatorLocation(detailDo.getFromLocationCode()); |
|
|
|
mainDo.setFromAreaCodes(locationDO.getAreaCode()); |
|
|
|
mainDo.setFromLocationTypes(locationDO.getCode()); |
|
|
|
}catch (Exception ex) { |
|
|
|
message.append(ex.getMessage()).append(","); |
|
|
|
} |
|
|
|
try{ |
|
|
|
jobUtils.ifInToLocationType(detailDo.getFromLocationCode(),businesstypeDO); |
|
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
|
mainDo.setFromLocationTypes(businesstypeDO.getOutLocationTypes()); |
|
|
|
mainDo.setFromAreaCodes(businesstypeDO.getOutAreaCodes()); |
|
|
|
|
|
|
|
}catch (Exception ex) { |
|
|
|
message.append(ex.getMessage()).append(","); |
|
|
|
} |
|
|
|
try{ |
|
|
|
detailDo.setInventoryStatus("SCRAP"); |
|
|
|
String INVENTORY = detailDo.getInventoryStatus(); |
|
|
|
String[] inventory = INVENTORY.split(","); |
|
|
|
List<String> inventorystatus = Arrays.asList(inventory); |
|
|
|
List<BalanceDO> balanceDO = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(),detailDo.getPackingNumber(),detailDo.getBatch(), detailDo.getFromLocationCode(),inventorystatus); |
|
|
|
for(BalanceDO balance: balanceDO){ |
|
|
|
mainDo.setFromWarehouseCode(balance.getWarehouseCode()); |
|
|
|
} |
|
|
|
}catch (Exception ex) { |
|
|
|
message.append(ex.getMessage()).append(","); |
|
|
|
} |
|
|
|
return message.toString(); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public List<ScrapRequestImportErrorVO> importscrapRequestList(List<ScrapRequestMainCreateReqVO> datas, Integer mode, boolean updatePart){ |
|
|
|
if (CollUtil.isEmpty(datas)) { |
|
|
|
throw exception(SCRAP_REQUEST_MAIN_NOT_EXISTS); |
|
|
|
} |
|
|
|
List<ScrapRequestImportErrorVO> errorList = new ArrayList<>(); |
|
|
|
datas.forEach(createReqVO -> { |
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapRequest"); |
|
|
|
ScrapRequestMainDO mainDo = ScrapRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
String messageMain = validateScrapRequestMainImport(mainDo, businesstypeDO); |
|
|
|
List<ScrapRequestDetailCreateReqVO> subList = createReqVO.getSubList(); |
|
|
|
List<ScrapRequestDetailDO> subDOList = ScrapRequestDetailConvert.INSTANCE.convertList03(subList); |
|
|
|
// 是否有错误数据
|
|
|
|
boolean flag = true; |
|
|
|
for (ScrapRequestDetailDO detailDO : subDOList) { |
|
|
|
String messageDetail = validateScrapvRequestDetailImport(detailDO, mainDo, businesstypeDO); |
|
|
|
if (!"".equals(messageMain) ||!"".equals(messageDetail) ) { |
|
|
|
ScrapRequestImportErrorVO importErrorVO = ScrapRequestMainConvert.INSTANCE.convert(createReqVO, detailDO); |
|
|
|
importErrorVO.setImportStatus("失败"); |
|
|
|
messageMain = messageMain + messageDetail; |
|
|
|
importErrorVO.setImportRemark(messageMain.substring(0, messageMain.length() - 1)); |
|
|
|
errorList.add(importErrorVO); |
|
|
|
flag = false; |
|
|
|
} |
|
|
|
} |
|
|
|
//写入数据
|
|
|
|
if (flag) { |
|
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_REQUEST.getCode()); |
|
|
|
mainDo.setNumber(number); |
|
|
|
RequestStatusState requestStatusState = new RequestStatusState(); |
|
|
|
requestStatusState.newObject(mainDo.getAutoCommit(), mainDo.getAutoAgree(), mainDo.getAutoExecute()); |
|
|
|
mainDo.setStatus(requestStatusState.getState().getCode()); |
|
|
|
scrapRequestMainMapper.insert(mainDo); |
|
|
|
for (ScrapRequestDetailDO detailDO : subDOList) { |
|
|
|
detailDO.setMasterId(mainDo.getId()); |
|
|
|
detailDO.setNumber(number); |
|
|
|
} |
|
|
|
scrapRequestDetailMapper.insertBatch(subDOList); |
|
|
|
} |
|
|
|
}); |
|
|
|
return errorList; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
public List<ScrapRequestMainDO> getScrapRequestMainList1(CustomConditions conditions) { |
|
|
|
return scrapRequestMainMapper.selectSeniorList(conditions); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
