|
|
@ -5,6 +5,8 @@ import com.win.framework.common.exception.ServiceException; |
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
import com.win.framework.common.pojo.CustomConditions; |
|
|
import com.win.framework.common.pojo.PageResult; |
|
|
import com.win.framework.common.pojo.PageResult; |
|
|
import com.win.framework.dict.core.util.DictFrameworkUtils; |
|
|
import com.win.framework.dict.core.util.DictFrameworkUtils; |
|
|
|
|
|
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.api.serialnumber.SerialNumberApi; |
|
|
import com.win.module.system.enums.serialNumber.RuleCodeEnum; |
|
|
import com.win.module.system.enums.serialNumber.RuleCodeEnum; |
|
|
import com.win.module.wms.controller.inventorychangeRequest.vo.*; |
|
|
import com.win.module.wms.controller.inventorychangeRequest.vo.*; |
|
|
@ -20,6 +22,7 @@ import com.win.module.wms.dal.dataobject.requestsetting.RequestsettingDO; |
|
|
import com.win.module.wms.dal.mysql.inventorychangeRequest.InventorychangeRequestDetailMapper; |
|
|
import com.win.module.wms.dal.mysql.inventorychangeRequest.InventorychangeRequestDetailMapper; |
|
|
import com.win.module.wms.dal.mysql.inventorychangeRequest.InventorychangeRequestMainMapper; |
|
|
import com.win.module.wms.dal.mysql.inventorychangeRequest.InventorychangeRequestMainMapper; |
|
|
import com.win.module.wms.enums.DictTypeConstants; |
|
|
import com.win.module.wms.enums.DictTypeConstants; |
|
|
|
|
|
import com.win.module.wms.enums.request.RequestStatusEnum; |
|
|
import com.win.module.wms.service.itembasic.ItembasicService; |
|
|
import com.win.module.wms.service.itembasic.ItembasicService; |
|
|
import com.win.module.wms.service.itempackaging.ItempackagingService; |
|
|
import com.win.module.wms.service.itempackaging.ItempackagingService; |
|
|
import com.win.module.wms.service.location.LocationService; |
|
|
import com.win.module.wms.service.location.LocationService; |
|
|
@ -27,7 +30,6 @@ import com.win.module.wms.service.requestsetting.RequestsettingService; |
|
|
import com.win.module.wms.service.shift.ShiftService; |
|
|
import com.win.module.wms.service.shift.ShiftService; |
|
|
import com.win.module.wms.util.JobUtils; |
|
|
import com.win.module.wms.util.JobUtils; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.stereotype.Service; |
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport; |
|
|
|
|
|
import org.springframework.validation.annotation.Validated; |
|
|
import org.springframework.validation.annotation.Validated; |
|
|
|
|
|
|
|
|
import javax.annotation.Resource; |
|
|
import javax.annotation.Resource; |
|
|
@ -36,8 +38,7 @@ import java.util.Collection; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; |
|
|
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; |
|
|
import static com.win.module.wms.enums.ErrorCodeConstants.INVENTORYCHANGE_REQUEST_MAIN_NOT_EXISTS; |
|
|
import static com.win.module.wms.enums.ErrorCodeConstants.*; |
|
|
import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASECLAIM_REQUEST_IMPORT_LIST_IS_EMPTY; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 库存修改申请主 Service 实现类 |
|
|
* 库存修改申请主 Service 实现类 |
|
|
@ -64,25 +65,33 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq |
|
|
private LocationService locationService; |
|
|
private LocationService locationService; |
|
|
@Resource |
|
|
@Resource |
|
|
private SerialNumberApi serialNumberApi; |
|
|
private SerialNumberApi serialNumberApi; |
|
|
|
|
|
@Resource |
|
|
|
|
|
private TrendsApi trendsApi; |
|
|
@Resource |
|
|
@Resource |
|
|
private RequestsettingService requestsettingService; |
|
|
private RequestsettingService requestsettingService; |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public Long createInventorychangeRequestMain(InventorychangeRequestMainCreateReqVO createReqVO) { |
|
|
public Long createInventorychangeRequestMain(InventorychangeRequestMainCreateReqVO createReqVO) { |
|
|
// 插入
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("InventorychangeRequest"); |
|
|
InventorychangeRequestMainDO inventorychangeRequestMain = InventorychangeRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
InventorychangeRequestMainDO inventorychangeRequestMainDO = validatorToCreate(createReqVO); |
|
|
inventorychangeRequestMainMapper.insert(inventorychangeRequestMain); |
|
|
//调用自动执行方法
|
|
|
// 返回
|
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(inventorychangeRequestMainDO.getStatus())) { |
|
|
return inventorychangeRequestMain.getId(); |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
trendsApi.createTrends(requestsettingDO.getId(), "DeliverPlan", "增加了发货计划", TrendsTypeEnum.CREATE); |
|
|
|
|
|
return inventorychangeRequestMainDO.getId(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public void updateInventorychangeRequestMain(InventorychangeRequestMainUpdateReqVO updateReqVO) { |
|
|
public void updateInventorychangeRequestMain(InventorychangeRequestMainUpdateReqVO updateReqVO) { |
|
|
|
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("DeliverPlan"); |
|
|
// 校验存在
|
|
|
// 校验存在
|
|
|
validateInventorychangeRequestMainExists(updateReqVO.getId()); |
|
|
validateInventorychangeRequestMainExists(updateReqVO.getId()); |
|
|
// 更新
|
|
|
InventorychangeRequestMainDO inventorychangeRequestMainDO = validatorToUpdate(updateReqVO); |
|
|
InventorychangeRequestMainDO updateObj = InventorychangeRequestMainConvert.INSTANCE.convert(updateReqVO); |
|
|
if(RequestStatusEnum.HANDLING.getCode().equals(inventorychangeRequestMainDO.getStatus())) { |
|
|
inventorychangeRequestMainMapper.updateById(updateObj); |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
trendsApi.createTrends(requestsettingDO.getId(), "DeliverPlan", "修改了发货计划", TrendsTypeEnum.CREATE); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@ -131,312 +140,448 @@ public class InventorychangeRequestMainServiceImpl implements InventorychangeReq |
|
|
} |
|
|
} |
|
|
List<InventorychangeRequestMainImportErrorVO> errorList = new ArrayList<>(); |
|
|
List<InventorychangeRequestMainImportErrorVO> errorList = new ArrayList<>(); |
|
|
datas.forEach(createReqVO -> { |
|
|
datas.forEach(createReqVO -> { |
|
|
|
|
|
BusinesstypeDO businesstypeDO = new BusinesstypeDO(); |
|
|
|
|
|
InventorychangeRequestMainDO mainDo = InventorychangeRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
|
|
|
String messageMain = validateInventorychangeRequestMainImport(mainDo, businesstypeDO); |
|
|
|
|
|
List<InventorychangeRequestDetailCreateReqVO> subList = createReqVO.getSubList(); |
|
|
|
|
|
List<InventorychangeRequestDetailDO> subDOList = InventorychangeRequestDetailConvert.INSTANCE.convertList03(subList); |
|
|
|
|
|
// 是否有错误数据
|
|
|
|
|
|
boolean flag = true; |
|
|
|
|
|
for (InventorychangeRequestDetailDO detailDO : subDOList) { |
|
|
|
|
|
String messageDetail = validateInventorychangeRequestDetailImport(detailDO, mainDo, businesstypeDO); |
|
|
|
|
|
if (!messageMain.isEmpty() || messageDetail.isEmpty()) { |
|
|
|
|
|
InventorychangeRequestMainImportErrorVO importErrorVO = InventorychangeRequestMainConvert.INSTANCE.convert(createReqVO, detailDO); |
|
|
|
|
|
importErrorVO.setImportStatus("失败"); |
|
|
|
|
|
messageMain = messageMain + messageDetail; |
|
|
|
|
|
importErrorVO.setImportRemark(messageMain.substring(0, messageMain.length() - 1)); |
|
|
|
|
|
errorList.add(importErrorVO); |
|
|
|
|
|
flag = false; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
//写入数据
|
|
|
|
|
|
if (flag) { |
|
|
|
|
|
mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); |
|
|
|
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryChangeRequest"); |
|
|
|
|
|
if (businesstypeDO != null) { |
|
|
|
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
|
|
|
} |
|
|
|
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_CHANGE_REQUEST.getCode()); |
|
|
|
|
|
mainDo.setNumber(number); |
|
|
|
|
|
inventorychangeRequestMainMapper.insert(mainDo); |
|
|
|
|
|
for (InventorychangeRequestDetailDO detailDO : subDOList) { |
|
|
|
|
|
detailDO.setNumber(mainDo.getNumber()); |
|
|
|
|
|
detailDO.setMasterId(mainDo.getId()); |
|
|
|
|
|
} |
|
|
|
|
|
inventorychangeRequestDetailMapper.insertBatch(subDOList); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
return errorList; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* 主表校验导入，并赋值一些参数 |
|
|
|
|
|
* |
|
|
|
|
|
* @param mainDo |
|
|
|
|
|
* @return |
|
|
|
|
|
*/ |
|
|
|
|
|
private String validateInventorychangeRequestMainImport(InventorychangeRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { |
|
|
// 校验，判断是否有不符合的原因，并加入errorList,如果主表则所有子表都加入errorList
|
|
|
// 校验，判断是否有不符合的原因，并加入errorList,如果主表则所有子表都加入errorList
|
|
|
String messageMain = ""; |
|
|
String messageMain = ""; |
|
|
//主表的验证
|
|
|
//主表的验证
|
|
|
|
|
|
return messageMain; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
//子表的验证
|
|
|
* 子表校验导入，并赋值一些参数 |
|
|
List<InventorychangeRequestDetailCreateReqVO> subList = createReqVO.getSubList(); |
|
|
* |
|
|
List<InventorychangeRequestDetailDO> subDOList = InventorychangeRequestDetailConvert.INSTANCE.convertList03(subList); |
|
|
* @param detailDo |
|
|
for (InventorychangeRequestDetailDO purchaseDetailDO : subDOList) { |
|
|
* @return |
|
|
|
|
|
*/ |
|
|
|
|
|
private String validateInventorychangeRequestDetailImport(InventorychangeRequestDetailDO detailDo, InventorychangeRequestMainDO mainDo, BusinesstypeDO businesstypeDO) { |
|
|
String messageDetail = ""; |
|
|
String messageDetail = ""; |
|
|
//校验来源库位基础信息
|
|
|
//校验来源库位基础信息
|
|
|
try { |
|
|
try { |
|
|
LocationDO locationDO = locationService.selectLocation(purchaseDetailDO.getLocationCode()); |
|
|
LocationDO locationDO = locationService.selectLocation(detailDo.getLocationCode()); |
|
|
if (locationDO != null) { |
|
|
if (locationDO != null) { |
|
|
purchaseDetailDO.setLocationCode(locationDO.getCode()); |
|
|
detailDo.setLocationCode(locationDO.getCode()); |
|
|
purchaseDetailDO.setAreaCode(locationDO.getAreaCode()); |
|
|
detailDo.setAreaCode(locationDO.getAreaCode()); |
|
|
purchaseDetailDO.setLocationGroupCode(locationDO.getLocationGroupCode()); |
|
|
detailDo.setLocationGroupCode(locationDO.getLocationGroupCode()); |
|
|
} |
|
|
} |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageMain += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
// 校验物品基础信息
|
|
|
// 校验物品基础信息
|
|
|
try { |
|
|
try { |
|
|
ItembasicDO itembasicDO = itembasicService.selectItembasic(purchaseDetailDO.getItemCode()); |
|
|
ItembasicDO itembasicDO = itembasicService.selectItembasic(detailDo.getItemCode()); |
|
|
if (itembasicDO.getUom() != purchaseDetailDO.getUom()) { |
|
|
if (itembasicDO.getUom() != detailDo.getUom()) { |
|
|
messageDetail += "计量单位" + itembasicDO.getUom() + "错误，应该是" + purchaseDetailDO.getUom() + ","; |
|
|
messageDetail += "计量单位" + itembasicDO.getUom() + "错误，应该是" + detailDo.getUom() + ","; |
|
|
} else { |
|
|
} else { |
|
|
purchaseDetailDO.setItemDesc1(itembasicDO.getDesc1()); |
|
|
detailDo.setItemDesc1(itembasicDO.getDesc1()); |
|
|
purchaseDetailDO.setItemDesc2(itembasicDO.getDesc2()); |
|
|
detailDo.setItemDesc2(itembasicDO.getDesc2()); |
|
|
purchaseDetailDO.setItemName(itembasicDO.getName()); |
|
|
detailDo.setItemName(itembasicDO.getName()); |
|
|
purchaseDetailDO.setProjectCode(itembasicDO.getProject()); |
|
|
detailDo.setProjectCode(itembasicDO.getProject()); |
|
|
} |
|
|
} |
|
|
purchaseDetailDO.setProjectCode(itembasicDO.getCode()); |
|
|
|
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
// 校验业务类型
|
|
|
// 校验业务类型
|
|
|
try { |
|
|
try { |
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); |
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); |
|
|
jobUtils.selectItembasicExist(purchaseDetailDO.getItemCode(), businesstypeDO); |
|
|
jobUtils.selectItembasicExist(detailDo.getItemCode(), businesstypeDO); |
|
|
jobUtils.ifOutInventoryStatuses(purchaseDetailDO.getFromInventoryStatus(), businesstypeDO); |
|
|
jobUtils.ifOutInventoryStatuses(detailDo.getFromInventoryStatus(), businesstypeDO); |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//隔离转合格申请
|
|
|
//隔离转合格申请
|
|
|
if ("Hold".equals(purchaseDetailDO.getFromInventoryStatus())) { |
|
|
if ("Hold".equals(detailDo.getFromInventoryStatus())) { |
|
|
// 校验库存余额是否存在
|
|
|
// 校验库存余额是否存在
|
|
|
try { |
|
|
try { |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
inventoryStatus.add("Hold"); |
|
|
inventoryStatus.add("Hold"); |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(purchaseDetailDO.getItemCode(), purchaseDetailDO.getFromPackingNumber() |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getFromPackingNumber() |
|
|
, purchaseDetailDO.getFromBatch(), purchaseDetailDO.getLocationCode(), inventoryStatus); |
|
|
, detailDo.getFromBatch(), detailDo.getLocationCode(), inventoryStatus); |
|
|
if (balanceDOList != null) { |
|
|
if (balanceDOList != null) { |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
purchaseDetailDO.setFromQty(balanceDO.getQty()); |
|
|
detailDo.setFromQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setToQty(balanceDO.getQty()); |
|
|
detailDo.setToQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setQty(balanceDO.getQty()); |
|
|
detailDo.setQty(balanceDO.getQty()); |
|
|
|
|
|
|
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setToProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setToProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setToExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setToExpireDate(balanceDO.getExpireDate()); |
|
|
} |
|
|
} |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
purchaseDetailDO.setToInventoryStatus("OK"); |
|
|
detailDo.setToInventoryStatus("OK"); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_REQUEST.getCode()); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_REQUEST.getCode()); |
|
|
createReqVO.setNumber(number); |
|
|
detailDo.setNumber(number); |
|
|
|
|
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); |
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToScrapRequest"); |
|
|
if (businesstypeDO != null) { |
|
|
if (businesstypeDO != null) { |
|
|
createReqVO.setBusinessType(businesstypeDO.getCode()); |
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
} |
|
|
} |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("HoldToScrapRequest"); |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("HoldToScrapRequest"); |
|
|
if (requestsettingDO != null) { |
|
|
if (requestsettingDO != null) { |
|
|
createReqVO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
createReqVO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
createReqVO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
createReqVO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//合格转隔离申请
|
|
|
//合格转隔离申请
|
|
|
if ("OK".equals(purchaseDetailDO.getFromInventoryStatus())) { |
|
|
if ("OK".equals(detailDo.getFromInventoryStatus())) { |
|
|
// 校验库存余额是否存在
|
|
|
// 校验库存余额是否存在
|
|
|
try { |
|
|
try { |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
inventoryStatus.add("OK"); |
|
|
inventoryStatus.add("OK"); |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(purchaseDetailDO.getItemCode(), purchaseDetailDO.getFromPackingNumber() |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getFromPackingNumber() |
|
|
, purchaseDetailDO.getFromBatch(), purchaseDetailDO.getLocationCode(), inventoryStatus); |
|
|
, detailDo.getFromBatch(), detailDo.getLocationCode(), inventoryStatus); |
|
|
if (balanceDOList != null) { |
|
|
if (balanceDOList != null) { |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
purchaseDetailDO.setFromQty(balanceDO.getQty()); |
|
|
detailDo.setFromQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setToQty(balanceDO.getQty()); |
|
|
detailDo.setToQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setQty(balanceDO.getQty()); |
|
|
detailDo.setQty(balanceDO.getQty()); |
|
|
|
|
|
|
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setToProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setToProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setToExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setToExpireDate(balanceDO.getExpireDate()); |
|
|
} |
|
|
} |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
purchaseDetailDO.setToInventoryStatus("Hold"); |
|
|
detailDo.setToInventoryStatus("Hold"); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_REQUEST.getCode()); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_REQUEST.getCode()); |
|
|
createReqVO.setNumber(number); |
|
|
mainDo.setNumber(number); |
|
|
|
|
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); |
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); |
|
|
if (businesstypeDO != null) { |
|
|
if (businesstypeDO != null) { |
|
|
createReqVO.setBusinessType(businesstypeDO.getCode()); |
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
} |
|
|
} |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("OkToHoldRequest"); |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("OkToHoldRequest"); |
|
|
if (requestsettingDO != null) { |
|
|
if (requestsettingDO != null) { |
|
|
createReqVO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
createReqVO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
createReqVO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
createReqVO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
purchaseDetailDO.setToPackingNumber(null); |
|
|
detailDo.setToPackingNumber(null); |
|
|
purchaseDetailDO.setToBatch(null); |
|
|
detailDo.setToBatch(null); |
|
|
purchaseDetailDO.setToContainerNumber(null); |
|
|
detailDo.setToContainerNumber(null); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//隔离转报废申请
|
|
|
//隔离转报废申请
|
|
|
if ("Hold".equals(purchaseDetailDO.getFromInventoryStatus())) { |
|
|
if ("Hold".equals(detailDo.getFromInventoryStatus())) { |
|
|
// 校验库存余额是否存在
|
|
|
// 校验库存余额是否存在
|
|
|
try { |
|
|
try { |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
inventoryStatus.add("Hold"); |
|
|
inventoryStatus.add("Hold"); |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(purchaseDetailDO.getItemCode(), purchaseDetailDO.getFromPackingNumber() |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getFromPackingNumber() |
|
|
, purchaseDetailDO.getFromBatch(), purchaseDetailDO.getLocationCode(), inventoryStatus); |
|
|
, detailDo.getFromBatch(), detailDo.getLocationCode(), inventoryStatus); |
|
|
if (balanceDOList != null) { |
|
|
if (balanceDOList != null) { |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
purchaseDetailDO.setFromQty(balanceDO.getQty()); |
|
|
detailDo.setFromQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setToQty(balanceDO.getQty()); |
|
|
detailDo.setToQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setQty(balanceDO.getQty()); |
|
|
detailDo.setQty(balanceDO.getQty()); |
|
|
|
|
|
|
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setToProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setToProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setToExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setToExpireDate(balanceDO.getExpireDate()); |
|
|
} |
|
|
} |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
purchaseDetailDO.setToInventoryStatus("Scrap"); |
|
|
detailDo.setToInventoryStatus("Scrap"); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_REQUEST.getCode()); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_HOLD_REQUEST.getCode()); |
|
|
createReqVO.setNumber(number); |
|
|
mainDo.setNumber(number); |
|
|
|
|
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); |
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToHoldRequest"); |
|
|
if (businesstypeDO != null) { |
|
|
if (businesstypeDO != null) { |
|
|
createReqVO.setBusinessType(businesstypeDO.getCode()); |
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
} |
|
|
} |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("OkToHoldRequest"); |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("OkToHoldRequest"); |
|
|
if (requestsettingDO != null) { |
|
|
if (requestsettingDO != null) { |
|
|
createReqVO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
createReqVO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
createReqVO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
createReqVO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
purchaseDetailDO.setFromPackingNumber(null); |
|
|
detailDo.setFromPackingNumber(null); |
|
|
purchaseDetailDO.setFromBatch(null); |
|
|
detailDo.setFromBatch(null); |
|
|
purchaseDetailDO.setFromContainerNumber(null); |
|
|
detailDo.setFromContainerNumber(null); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//报废转隔离申请
|
|
|
//报废转隔离申请
|
|
|
if ("Scrap".equals(purchaseDetailDO.getFromInventoryStatus())) { |
|
|
if ("Scrap".equals(detailDo.getFromInventoryStatus())) { |
|
|
// 校验库存余额是否存在
|
|
|
// 校验库存余额是否存在
|
|
|
try { |
|
|
try { |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
inventoryStatus.add("Scrap"); |
|
|
inventoryStatus.add("Scrap"); |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(purchaseDetailDO.getItemCode(), purchaseDetailDO.getFromPackingNumber() |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getFromPackingNumber() |
|
|
, purchaseDetailDO.getFromBatch(), purchaseDetailDO.getLocationCode(), inventoryStatus); |
|
|
, detailDo.getFromBatch(), detailDo.getLocationCode(), inventoryStatus); |
|
|
if (balanceDOList != null) { |
|
|
if (balanceDOList != null) { |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
purchaseDetailDO.setFromQty(balanceDO.getQty()); |
|
|
detailDo.setFromQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setToQty(balanceDO.getQty()); |
|
|
detailDo.setToQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setQty(balanceDO.getQty()); |
|
|
detailDo.setQty(balanceDO.getQty()); |
|
|
|
|
|
|
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setToProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setToProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setToExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setToExpireDate(balanceDO.getExpireDate()); |
|
|
} |
|
|
} |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
purchaseDetailDO.setToInventoryStatus("Scrap"); |
|
|
detailDo.setToInventoryStatus("Scrap"); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_REQUEST.getCode()); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_TO_HOLD_REQUEST.getCode()); |
|
|
createReqVO.setNumber(number); |
|
|
mainDo.setNumber(number); |
|
|
|
|
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); |
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("ScrapToHoldRequest"); |
|
|
if (businesstypeDO != null) { |
|
|
if (businesstypeDO != null) { |
|
|
createReqVO.setBusinessType(businesstypeDO.getCode()); |
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
} |
|
|
} |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ScrapToHoldRequest"); |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("ScrapToHoldRequest"); |
|
|
if (requestsettingDO != null) { |
|
|
if (requestsettingDO != null) { |
|
|
createReqVO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
createReqVO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
createReqVO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
createReqVO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
purchaseDetailDO.setFromPackingNumber(null); |
|
|
detailDo.setFromPackingNumber(null); |
|
|
purchaseDetailDO.setFromBatch(null); |
|
|
detailDo.setFromBatch(null); |
|
|
purchaseDetailDO.setFromContainerNumber(null); |
|
|
detailDo.setFromContainerNumber(null); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
//合格转报废
|
|
|
//合格转报废
|
|
|
if ("Ok".equals(purchaseDetailDO.getFromInventoryStatus())) { |
|
|
if ("Ok".equals(detailDo.getFromInventoryStatus())) { |
|
|
// 校验库存余额是否存在
|
|
|
// 校验库存余额是否存在
|
|
|
try { |
|
|
try { |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
inventoryStatus.add("Scrap"); |
|
|
inventoryStatus.add("Scrap"); |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(purchaseDetailDO.getItemCode(), purchaseDetailDO.getFromPackingNumber() |
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(detailDo.getItemCode(), detailDo.getFromPackingNumber() |
|
|
, purchaseDetailDO.getFromBatch(), purchaseDetailDO.getLocationCode(), inventoryStatus); |
|
|
, detailDo.getFromBatch(), detailDo.getLocationCode(), inventoryStatus); |
|
|
if (balanceDOList != null) { |
|
|
if (balanceDOList != null) { |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
purchaseDetailDO.setFromQty(balanceDO.getQty()); |
|
|
detailDo.setFromQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setToQty(balanceDO.getQty()); |
|
|
detailDo.setToQty(balanceDO.getQty()); |
|
|
purchaseDetailDO.setQty(balanceDO.getQty()); |
|
|
detailDo.setQty(balanceDO.getQty()); |
|
|
|
|
|
|
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
purchaseDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
detailDo.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
purchaseDetailDO.setToProduceDate(balanceDO.getProduceDate()); |
|
|
detailDo.setToProduceDate(balanceDO.getProduceDate()); |
|
|
purchaseDetailDO.setToExpireDate(balanceDO.getExpireDate()); |
|
|
detailDo.setToExpireDate(balanceDO.getExpireDate()); |
|
|
} |
|
|
} |
|
|
} catch (ServiceException ex) { |
|
|
} catch (ServiceException ex) { |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
messageDetail += ex.getMessage() + ","; |
|
|
} |
|
|
} |
|
|
purchaseDetailDO.setToInventoryStatus("Scrap"); |
|
|
detailDo.setToInventoryStatus("Scrap"); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_REQUEST.getCode()); |
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_REQUEST.getCode()); |
|
|
createReqVO.setNumber(number); |
|
|
mainDo.setNumber(number); |
|
|
|
|
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); |
|
|
businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRequest"); |
|
|
if (businesstypeDO != null) { |
|
|
if (businesstypeDO != null) { |
|
|
createReqVO.setBusinessType(businesstypeDO.getCode()); |
|
|
mainDo.setBusinessType(businesstypeDO.getCode()); |
|
|
} |
|
|
} |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("OkToScrapRequest"); |
|
|
RequestsettingDO requestsettingDO = requestsettingService.selectRequestsettingExist("OkToScrapRequest"); |
|
|
if (requestsettingDO != null) { |
|
|
if (requestsettingDO != null) { |
|
|
createReqVO.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
mainDo.setAutoAgree(requestsettingDO.getAutoAgree()); |
|
|
createReqVO.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
mainDo.setAutoCommit(requestsettingDO.getAutoCommit()); |
|
|
createReqVO.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
mainDo.setAutoExecute(requestsettingDO.getAutoExecute()); |
|
|
createReqVO.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
mainDo.setDirectCreateRecord(requestsettingDO.getDirectCreateRecord()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
purchaseDetailDO.setFromPackingNumber(null); |
|
|
detailDo.setFromPackingNumber(null); |
|
|
purchaseDetailDO.setFromBatch(null); |
|
|
detailDo.setFromBatch(null); |
|
|
purchaseDetailDO.setFromContainerNumber(null); |
|
|
detailDo.setFromContainerNumber(null); |
|
|
|
|
|
} |
|
|
|
|
|
return messageDetail; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
InventorychangeRequestDetailCreateReqVO purchaseDetailCreateReqVO = InventorychangeRequestDetailConvert.INSTANCE.convert1(purchaseDetailDO); |
|
|
//新增方法（主和子）
|
|
|
InventorychangeRequestMainImportErrorVO importVO = InventorychangeRequestDetailConvert.INSTANCE.convert(createReqVO, purchaseDetailCreateReqVO); |
|
|
private InventorychangeRequestMainDO validatorToCreate(InventorychangeRequestMainCreateReqVO createReqVO) { |
|
|
//进行子表的错误统计
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverPlan"); |
|
|
//主表没有错误 写入库里
|
|
|
InventorychangeRequestMainDO inventorychangeRequestMainDO = validateMainMethod(createReqVO, businesstypeDO); |
|
|
if (!messageMain.equals("") || !messageDetail.equals("")) { |
|
|
//子表校验
|
|
|
importVO.setImportStatus("失败"); |
|
|
List<InventorychangeRequestDetailCreateReqVO> subList = createReqVO.getSubList(); |
|
|
messageMain = messageMain + messageDetail; |
|
|
List<InventorychangeRequestDetailDO> subDOList = InventorychangeRequestDetailConvert.INSTANCE.convertList03(subList); |
|
|
|
|
|
for (InventorychangeRequestDetailDO inventorychangeRequestDetailDO : subDOList) { |
|
|
|
|
|
validateDetailMethod(inventorychangeRequestDetailDO); |
|
|
|
|
|
} |
|
|
|
|
|
String number = serialNumberApi.generateCode(RuleCodeEnum.HOLD_TO_SCRAP_REQUEST.getCode()); |
|
|
|
|
|
inventorychangeRequestMainDO.setNumber(number); |
|
|
|
|
|
inventorychangeRequestMainMapper.insert(inventorychangeRequestMainDO); |
|
|
|
|
|
for (InventorychangeRequestDetailDO inventorychangeRequestDetailDO : subDOList) { |
|
|
|
|
|
inventorychangeRequestDetailDO.setNumber(inventorychangeRequestMainDO.getNumber()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setMasterId(inventorychangeRequestMainDO.getId()); |
|
|
|
|
|
} |
|
|
|
|
|
inventorychangeRequestDetailMapper.insertBatch(subDOList); |
|
|
|
|
|
return inventorychangeRequestMainDO; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
importVO.setImportRemark(messageMain.substring(0, messageMain.length() - 1)); |
|
|
//修改方法（主和子）
|
|
|
errorList.add(importVO); |
|
|
private InventorychangeRequestMainDO validatorToUpdate(InventorychangeRequestMainUpdateReqVO updateReqVO) { |
|
|
} else { |
|
|
BusinesstypeDO businesstypeDO = new BusinesstypeDO(); |
|
|
purchaseDetailDO.setNumber(createReqVO.getNumber()); |
|
|
InventorychangeRequestMainDO deliverPlanMainDO = validateMainMethod(updateReqVO, businesstypeDO); |
|
|
purchaseDetailDO.setMasterId(createReqVO.getId()); |
|
|
//子表校验
|
|
|
|
|
|
List<InventorychangeRequestDetailUpdateReqVO> subList = updateReqVO.getSubList(); |
|
|
|
|
|
List<InventorychangeRequestDetailDO> subDOList = InventorychangeRequestDetailConvert.INSTANCE.convertList05(subList); |
|
|
|
|
|
for (InventorychangeRequestDetailDO inventorychangeRequestDetailDO : subDOList) { |
|
|
|
|
|
validateDetailMethod(inventorychangeRequestDetailDO); |
|
|
} |
|
|
} |
|
|
|
|
|
inventorychangeRequestMainMapper.updateById(deliverPlanMainDO); |
|
|
|
|
|
inventorychangeRequestDetailMapper.updateBatch(subDOList); |
|
|
|
|
|
return deliverPlanMainDO; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (errorList.isEmpty()) { |
|
|
//校验主表公共方法(适用于新增/修改)
|
|
|
if (mode != 3) { |
|
|
private InventorychangeRequestMainDO validateMainMethod(InventorychangeRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO) { |
|
|
createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); |
|
|
InventorychangeRequestMainDO InventorychangeRequestMainDO = InventorychangeRequestMainConvert.INSTANCE.convert(baseVO); |
|
|
|
|
|
return InventorychangeRequestMainDO; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
InventorychangeRequestMainDO createObj = InventorychangeRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
//校验子表公共方法(适用于新增/修改)
|
|
|
inventorychangeRequestMainMapper.insert(createObj); |
|
|
private void validateDetailMethod(InventorychangeRequestDetailDO inventorychangeRequestDetailDO) { |
|
|
inventorychangeRequestDetailMapper.insertBatch(subDOList); |
|
|
LocationDO locationDO = this.validatorLocation(inventorychangeRequestDetailDO.getLocationCode()); |
|
|
} else if (mode != 2) { |
|
|
if (locationDO != null) { |
|
|
createReqVO.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); |
|
|
inventorychangeRequestDetailDO.setLocationCode(locationDO.getCode()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setAreaCode(locationDO.getAreaCode()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setLocationGroupCode(locationDO.getLocationGroupCode()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
InventorychangeRequestMainDO createObj = InventorychangeRequestMainConvert.INSTANCE.convert(createReqVO); |
|
|
ItembasicDO itembasicDO = this.validatorItembasic(inventorychangeRequestDetailDO.getItemCode()); |
|
|
inventorychangeRequestMainMapper.updateById(createObj); |
|
|
if (!inventorychangeRequestDetailDO.getUom().equals(itembasicDO.getUom())) { |
|
|
inventorychangeRequestDetailMapper.updateBatch(subDOList); |
|
|
throw exception(UOM_ERROR, inventorychangeRequestDetailDO.getUom()); |
|
|
|
|
|
} else { |
|
|
|
|
|
inventorychangeRequestDetailDO.setItemDesc1(itembasicDO.getDesc1()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setItemDesc2(itembasicDO.getDesc2()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setItemName(itembasicDO.getName()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setProjectCode(itembasicDO.getProject()); |
|
|
|
|
|
} |
|
|
|
|
|
//校验库存余额是否存在
|
|
|
|
|
|
List<String> inventoryStatus = new ArrayList<>(); |
|
|
|
|
|
//隔离转合格申请
|
|
|
|
|
|
if ("Hold".equals(inventorychangeRequestDetailDO.getFromInventoryStatus())) { |
|
|
|
|
|
|
|
|
|
|
|
inventoryStatus.add("Hold"); |
|
|
} |
|
|
} |
|
|
|
|
|
//合格转隔离申请
|
|
|
|
|
|
if ("HOKold".equals(inventorychangeRequestDetailDO.getFromInventoryStatus())) { |
|
|
|
|
|
inventoryStatus.add("OK"); |
|
|
} |
|
|
} |
|
|
}); |
|
|
//隔离转报废申请
|
|
|
//错误不为空并非部分更新，手工回滚
|
|
|
if ("Hold".equals(inventorychangeRequestDetailDO.getFromInventoryStatus())) { |
|
|
if (!errorList.isEmpty() && !updatePart) { |
|
|
inventoryStatus.add("Hold"); |
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); |
|
|
|
|
|
} |
|
|
} |
|
|
return errorList; |
|
|
//报废转隔离申请
|
|
|
|
|
|
if ("Scrap".equals(inventorychangeRequestDetailDO.getFromInventoryStatus())) { |
|
|
|
|
|
inventoryStatus.add("Scrap"); |
|
|
|
|
|
} |
|
|
|
|
|
//合格转报废申请
|
|
|
|
|
|
if ("Ok".equals(inventorychangeRequestDetailDO.getFromInventoryStatus())) { |
|
|
|
|
|
inventoryStatus.add("Scrap"); |
|
|
|
|
|
} |
|
|
|
|
|
List<BalanceDO> balanceDOList = this.validatorLocationReturnManagementAccuracy(inventorychangeRequestDetailDO.getItemCode(), inventorychangeRequestDetailDO.getFromPackingNumber() |
|
|
|
|
|
, inventorychangeRequestDetailDO.getFromBatch(), inventorychangeRequestDetailDO.getLocationCode(), inventoryStatus); |
|
|
|
|
|
if (balanceDOList != null) { |
|
|
|
|
|
BalanceDO balanceDO = balanceDOList.get(0); |
|
|
|
|
|
inventorychangeRequestDetailDO.setFromQty(balanceDO.getQty()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setToQty(balanceDO.getQty()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setQty(balanceDO.getQty()); |
|
|
|
|
|
|
|
|
|
|
|
inventorychangeRequestDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setFromProduceDate(balanceDO.getProduceDate()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setFromExpireDate(balanceDO.getExpireDate()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setToArrivdAte(balanceDO.getArriveDate()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setToProduceDate(balanceDO.getProduceDate()); |
|
|
|
|
|
inventorychangeRequestDetailDO.setToExpireDate(balanceDO.getExpireDate()); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//子表校验来源库位基础信息
|
|
|
|
|
|
private LocationDO validatorLocation(String locationCode) { |
|
|
|
|
|
LocationDO locationDO = locationService.selectLocation(locationCode); |
|
|
|
|
|
return locationDO; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//子表校验物品基础信息
|
|
|
|
|
|
private ItembasicDO validatorItembasic(String itemCode) { |
|
|
|
|
|
return itembasicService.selectItembasic(itemCode); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//子表校验业务类型
|
|
|
|
|
|
private void validatorItembasic(String itemCode, String fromInventoryStatus) { |
|
|
|
|
|
BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("HoldToOk"); |
|
|
|
|
|
jobUtils.selectItembasicExist(itemCode, businesstypeDO); |
|
|
|
|
|
jobUtils.ifOutInventoryStatuses(fromInventoryStatus, businesstypeDO); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private List<BalanceDO> validatorLocationReturnManagementAccuracy(String itemCode, String fromPackingNumber, String fromBatch, String locationCode, List<String> inventoryStatus) { |
|
|
|
|
|
List<BalanceDO> balanceDOList = jobUtils.selectlocationReturnManagementAccuracy(itemCode, fromPackingNumber |
|
|
|
|
|
, fromBatch, locationCode, inventoryStatus); |
|
|
|
|
|
return balanceDOList; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
