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

成都发运，临时提交

Browse Source
uat-temp-nht-2503130000-chengdu-shipping
jason 2 months ago
parent d417f0aa7b
commit 84650598c9
3 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-ext-mes-api/src/main/java/cn/estsh/i3plus/ext/mes/api/base/IMesLoadingListService.java
Unescape Escape View File

@ -15,7 +15,7 @@ public interface IMesLoadingListService extends IBaseMesService<MesLoadingList>
@ApiOperation("根据发运单号查询装车单信息")
MesLoadingList getMesLoadingListByShippingCode(String organizeCode, String shippingCode);
void submit(List<Long> ids);
void doSubmit(List<Long> ids);
void createVolvoAsn(List<Long> ids);
void doCreateVolvoAsn(List<Long> ids);
}

7
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesLoadingListController.java
Unescape Escape View File

@ -2,10 +2,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.base;
import cn.estsh.i3plus.ext.mes.api.base.IMesLoadingListService;
import cn.estsh.i3plus.ext.mes.pojo.constant.MesCommonConstant;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.mes.bean.MesPartPtrDetail;
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesLoadingList;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -33,7 +30,7 @@ public class MesLoadingListController extends BaseMesController<MesLoadingList>
@ApiOperation(value = "确认")
public ResultBean submit(@RequestBody List<Long> ids) {
try {
mesLoadingListService.submit(ids);
mesLoadingListService.doSubmit(ids);
return ResultBean.success("确认成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -46,7 +43,7 @@ public class MesLoadingListController extends BaseMesController<MesLoadingList>
@ApiOperation(value = "创建沃尔沃的ASN")
public ResultBean createVolvoAsn(@RequestBody List<Long> ids) {
try {
mesLoadingListService.createVolvoAsn(ids);
mesLoadingListService.doCreateVolvoAsn(ids);
return ResultBean.success("确认成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);

63
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesLoadingListService.java
Unescape Escape View File

@ -32,6 +32,7 @@ import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@Slf4j
@ -173,7 +174,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
}
}
@Override
protected void onInsertBean(MesLoadingList item) {
List<String> shippingOrderNoList = new ArrayList<>();
@ -225,6 +226,7 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
}
@Override
protected void setPackQueryBean(MesLoadingList bean, DdlPackBean packBean) {
DdlPreparedPack.getStringEqualPack(bean.getOrderCode(), "orderCode", packBean);
DdlPreparedPack.getStringEqualPack(bean.getCustCode(), "custCode", packBean);
@ -245,17 +247,66 @@ public class MesLoadingListService extends BaseMesService<MesLoadingList> implem
}
@Override
public void submit(List<Long> ids) {
public void doSubmit(List<Long> ids) {
List<MesLoadingList> loadingLists = getMesLoadingListByIds(ids);
for (MesLoadingList loadingList : loadingLists) {
if (loadingList.getStatus() > MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue()) {
throw ImppExceptionBuilder.newInstance()
.setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
.setErrorDetail(String.format("装车单已扫描，不能再确认或取消确认！"))
.setSystemID(CommonEnumUtil.SOFT_TYPE.MES.getCode())
.build();
}
}
for (MesLoadingList loading : loadingLists) {
List<MesShippingOrderManagement> orderManagements = getMesShippingOrderManagement(loading);
if (loading.getStatus() == MesExtEnumUtil.MES_LOADING_STATUS.CREATE.getValue()) {
loading.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue());
for (MesShippingOrderManagement orderManagement : orderManagements) {
orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.LOADING.getValue());
}
baseRDao.update(loading);
shippingOrderManagementRepository.update(orderManagements);
} else if (loading.getStatus() == MesExtEnumUtil.MES_LOADING_STATUS.PUBLISH.getValue()) {
loading.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.CREATE.getValue());
for (MesShippingOrderManagement orderManagement : orderManagements) {
orderManagement.setStatus(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue());
}
baseRDao.update(loading);
shippingOrderManagementRepository.update(orderManagements);
}
}
}
@Override
public void createVolvoAsn(List<Long> ids) {
public void doCreateVolvoAsn(List<Long> ids) {
List<MesLoadingList> loadingLists = getMesLoadingListByIds(ids);
}
private List<MesLoadingList> getMesLoadingListByIds(List<Long> ids) {
List<MesLoadingList> loadingLists = new ArrayList<>();
return loadingLists;
String organizeCode = AuthUtilExt.getOrganizeCode();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getInPackList(ids, "id", packBean);
return baseRDao.findByHqlWhere(packBean);
}
private List<MesShippingOrderManagement> getMesShippingOrderManagement(MesLoadingList loading) {
List<MesShippingOrderManagement> orderManagements = new ArrayList<>();
String organizeCode = AuthUtilExt.getOrganizeCode();
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(loading.getId(), "pid", packBean);
List<MesLoadingListDetail> details = listDetailRepository.findByHqlWhere(packBean);
if (!CollectionUtils.isEmpty(details)) {
for (MesLoadingListDetail detail : details) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(detail.getShippingCode(), "shippingCode", ddlPackBean);
MesShippingOrderManagement orderManagement = shippingOrderManagementRepository.getByProperty(ddlPackBean);
if (orderManagement != null) {
orderManagements.add(orderManagement);
}
}
}
return orderManagements;
}
}

Write Preview
Loading…
Cancel
Save