jiaxin.lin
/
i3plus-mes-pcn-yfai
forked from I3-YF/i3plus-mes-pcn-yfai
1
0
Fork 0
Code Pull Requests Activity

发运单，装车单跳过逻辑调整

Browse Source
tags/yfai-pcn-ext-v2.0
jun 8 months ago
parent e22af55524
commit 59c44cb199
2 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File

27
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesShippingLoadingCheckService.java
Unescape Escape View File

@ -63,11 +63,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
//校验装车单
MesLoadingList loadingListResult = checkLoadingList(loadingList.getOrderCode(), loadingList.getOrganizeCode(),loadingList.getIsPass(),loadingList.getModifyUser());
//跳过
if(Objects.equals(MesPcnExtConstWords.THREE,loadingList.getIsPass())){
if(Objects.isNull(loadingListResult)){
return null;
}
//若生成装车单，则一定有装车单明细
DdlPackBean orderDetailPackBean = DdlPackBean.getDdlPackBean(loadingList.getOrganizeCode());
DdlPreparedPack.getNumEqualPack(loadingListResult.getId(), "pid", orderDetailPackBean);
@ -312,6 +310,17 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
MesExtEnumUtil.MES_LOADING_STATUS.CREATE_ASN.getDescription(),
MesExtEnumUtil.MES_LOADING_STATUS.LOADING.getDescription()));
}
//跳过
if (Objects.equals(MesPcnExtConstWords.THREE, isPass)) {
//跳过的单据和明细，系统默认是完成的
loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.SCANNED.getValue());
loadingList.setRemark(MesPcnExtConstWords.SHIP_PASS);
ConvertBean.serviceModelUpdate(loadingList, userName);
vehiclesOrderRepository.update(loadingList);
//明细跳过
updateLoadingList(loadingList, userName);
return null;
}
//增加发运顺序卡控，查询是否存在小于当前装车单对应的seq，且发运状态在（“创建”，“已确认”，“已生成ASN”，“装车中”）的装车单数据
List<Integer> loadingListStatusList = new ArrayList<>();
loadingListStatusList.add(MesExtEnumUtil.MES_LOADING_STATUS.CREATE.getValue());
@ -337,17 +346,9 @@ public class MesShippingLoadingCheckService implements IMesShippingLoadingCheckS
DdlPreparedPack.getInPackList(loadingListStatusList, "status", orderPackBean);
boolean exit = vehiclesOrderRepository.isExitByHql(orderPackBean);
if (exit) {
//1强过 3跳过
if((!Objects.isNull(isPass) && (Objects.equals(MesPcnExtConstWords.ONE,isPass) || Objects.equals(MesPcnExtConstWords.THREE,isPass)))){
if(Objects.equals(MesPcnExtConstWords.ONE,isPass)){
//1强过
if((!Objects.isNull(isPass) && Objects.equals(MesPcnExtConstWords.ONE,isPass))) {
loadingList.setRemark(MesPcnExtConstWords.STRONGER_PASS);
}else if(Objects.equals(MesPcnExtConstWords.THREE,isPass)){
//跳过的单据和明细，系统默认是完成的
loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.SCANNED.getValue());
loadingList.setRemark(MesPcnExtConstWords.SHIP_PASS);
//明细跳过
updateLoadingList(loadingList,userName);
}
ConvertBean.serviceModelUpdate(loadingList,userName);
vehiclesOrderRepository.update(loadingList);
}else {

28
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesSortShippingCheckService.java
Unescape Escape View File

@ -98,6 +98,17 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
MesExtEnumUtil.SHIPPING_ORDER_STATUS.valueOfDescription(orderManagement.getStatus()),
MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPING.getDescription(), MesExtEnumUtil.SHIPPING_ORDER_STATUS.PUBLISHED.getDescription()));
}
//跳过
if (Objects.equals(MesPcnExtConstWords.THREE, shippingOrderManagement.getIsPass())) {
//跳过的单据和明细，系统默认是完成的
orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
orderManagement.setRemark(MesPcnExtConstWords.SHIP_PASS);
ConvertBean.serviceModelUpdate(orderManagement, shippingOrderManagement.getModifyUser());
vehiclesOrderRepository.update(orderManagement);
//明细跳过
updateShippingOrderDetails(orderManagement.getOrganizeCode(), shippingOrderManagement.getModifyUser(), orderManagement.getId());
return null;
}
//校验发运单扫描顺序
List<Integer> statusForCheckList = new ArrayList<>();
@ -127,17 +138,9 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
DdlPreparedPack.getInPackList(statusForCheckList, "status", orderManagementPackBean);
boolean exists = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean);
if (exists) {
//1强过 3跳过
if((!Objects.isNull(shippingOrderManagement.getIsPass()) && (Objects.equals(MesPcnExtConstWords.ONE,shippingOrderManagement.getIsPass()) || Objects.equals(MesPcnExtConstWords.THREE,shippingOrderManagement.getIsPass())))){
if(Objects.equals(MesPcnExtConstWords.ONE,shippingOrderManagement.getIsPass())){
//1强过
if((!Objects.isNull(shippingOrderManagement.getIsPass()) && Objects.equals(MesPcnExtConstWords.ONE,shippingOrderManagement.getIsPass()))){
orderManagement.setRemark(MesPcnExtConstWords.STRONGER_PASS);
}else{
//跳过的单据和明细，系统默认是完成的
orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
orderManagement.setRemark(MesPcnExtConstWords.SHIP_PASS);
//明细跳过
updateShippingOrderDetails(orderManagement.getOrganizeCode(),shippingOrderManagement.getModifyUser(),orderManagement.getId());
}
ConvertBean.serviceModelUpdate(orderManagement,shippingOrderManagement.getModifyUser());
vehiclesOrderRepository.update(orderManagement);
}else{
@ -146,11 +149,6 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
}
}
//跳过
if(Objects.equals(MesPcnExtConstWords.THREE,shippingOrderManagement.getIsPass())){
return null;
}
//根据扫描的发运单找到是否装车配置，若是，则根据发运单查询是否生成装车单，若没生成装车单则提示此发运单配置是否装车为是,但没生成装车单，请检查数据！
if (Objects.equals(orderManagement.getIsLoading(), MesCommonConstant.TRUE_INTEGER)) {
//查询装车单明细

Write Preview
Loading…
Cancel
Save