Merge remote-tracking branch 'origin/uat-temp-nht-2505060000-shippingScanSn' into uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd

uat-temp-wj-chongqingdaqu-prod-huaweiyun-for-cd
王杰 3 months ago
commit 6165cfb243

@ -82,6 +82,9 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
checkShippingDetails(model, orderManagement, shippingGroup, produceSn, detail); checkShippingDetails(model, orderManagement, shippingGroup, produceSn, detail);
scanFlg = true; scanFlg = true;
//明细更新 //明细更新
if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
detail.setBarcode(model.getSn());
}
updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo()); updateOrderManagementDetails(produceSn, orderManagement, detail, model.getUserInfo());
break; break;
} }
@ -225,7 +228,6 @@ public class MesShippingScanSnStrategyServiceImpl implements IMesShippingScanStr
private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo) { private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, String userInfo) {
if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) { if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
detail.setBarcode(produceSn.getProductSn());
detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER); detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue()); detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
detail.setRemark("扫描完成"); detail.setRemark("扫描完成");

Loading…
Cancel
Save