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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
tags/yfai-pcn-ext-v1.0
微笑着面对明天 10 months ago
parent dc9ec29a6d 96f9fc2b66
commit ea54c32c19
3 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File

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

@ -237,7 +237,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
}
scanFlg = true;
detail.setBarcode(produceSn.getSerialNumber());
detail.setBarcode(produceSn.getProductSn());
if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
@ -367,6 +367,7 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
//封装信息
produceSn = new MesProduceSn();
produceSn.setSerialNumber(model.getSn());
produceSn.setProductSn(model.getSn());
produceSn.setPartNo(mesShippingOrderManagementDetail.getPartNo());
}
@ -497,40 +498,45 @@ public class MesSortShippingCheckService implements IMesSortShippingCheckService
ConvertBean.serviceModelUpdate(vehiclesOrderDetail, userInfo);
vehiclesOrderDetailRepository.save(vehiclesOrderDetail);
}
DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean);
DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean);
boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean);
//2.装车单中所有发运单全部变成发运回传
if(!exitByHql){
List<MesJisShipping> jisShippingList=new ArrayList<>();
DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean);
List<MesShippingOrderManagement> shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean);
for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) {
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(mesShippingOrderManagement.getId(), "pid", detailPackBean);
List<MesShippingOrderManagementDetail> shippingOrderManagementDetails = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean);
//当前装车单所有发运单明细 需要报工的数据
jisShippingList = jisShippingService.getJisShipping(mesShippingOrderManagement, shippingOrderManagementDetails, organizeCode);
}
if(StringUtils.isEmpty(orderManagement.getOrderCode())){
//保存当前发运单明细报工
jisShippingRepository.saveAll(jisShippingList);
if(!StringUtil.isEmpty(vehiclesOrderDetail)){
MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid());
if (!StringUtils.isEmpty(loadingList)) {
loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue());
ConvertBean.serviceModelUpdate(loadingList, userInfo);
shippingLoadingCheckService.update(loadingList);
jisShippingRepository.saveAll(getMesJisShippings(organizeCode, orderManagement));
}else{
DdlPackBean orderManagementPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", orderManagementPackBean);
DdlPreparedPack.getNumNOEqualPack(MesExtEnumUtil.SHIPPING_ORDER_STATUS.SHIPPED.getValue(), "status", orderManagementPackBean);
boolean exitByHql = shippingOrderManagementRepository.isExitByHql(orderManagementPackBean);
//2.装车单中所有发运单全部变成发运回传
if(!exitByHql){
DdlPackBean jisBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getStringEqualPack(orderManagement.getOrderCode(), "orderCode", jisBean);
List<MesShippingOrderManagement> shippingOrderManagementList = shippingOrderManagementRepository.findByHqlWhere(jisBean);
for (MesShippingOrderManagement mesShippingOrderManagement : shippingOrderManagementList) {
//保存当前发运单明细报工
jisShippingRepository.saveAll(getMesJisShippings(organizeCode, mesShippingOrderManagement));
}
}
if(!StringUtil.isEmpty(vehiclesOrderDetail)){
MesLoadingList loadingList = vehiclesOrderRepository.getById(vehiclesOrderDetail.getPid());
if (!StringUtils.isEmpty(loadingList)) {
loadingList.setStatus(MesExtEnumUtil.MES_LOADING_STATUS.ASN.getValue());
ConvertBean.serviceModelUpdate(loadingList, userInfo);
shippingLoadingCheckService.update(loadingList);
}
}
}
}
}
private List<MesJisShipping> getMesJisShippings(String organizeCode, MesShippingOrderManagement mesShippingOrderManagement) {
DdlPackBean detailPackBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPreparedPack.getNumEqualPack(mesShippingOrderManagement.getId(), "pid", detailPackBean);
List<MesShippingOrderManagementDetail> shippingOrderManagementDetails = shippingOrderManagementDetailRepository.findByHqlWhere(detailPackBean);
//当前装车单所有发运单明细 需要报工的数据
return jisShippingService.getJisShipping(mesShippingOrderManagement, shippingOrderManagementDetails, organizeCode);
}
@Override
@MonitorLog
public void update(MesShippingOrderManagement item) {

2
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/numberrule/GqxnyNumberRuleStrategyService.java
Unescape Escape View File

@ -73,7 +73,7 @@ public class GqxnyNumberRuleStrategyService implements INumberRulePackAttributeS
}
private String stringFormat(String data, Integer length) {
return stringFormat(data, length, true, MesPcnExtConstWords.ASTERISK);
return stringFormat(data, length, true, MesPcnExtConstWords.SEPARATOR);
}
private String stringFormat(String data, Integer length, boolean left, String symbol) {

2
modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java
Unescape Escape View File

@ -272,6 +272,8 @@ public class MesPcnExtConstWords {
// *
public static final String ASTERISK = "*";
public static final String SEPARATOR = "-";
//过程条码默认生成规则

Write Preview
Loading…
Cancel
Save