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