|
|
|
@ -177,7 +177,7 @@ public class mesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl implements
|
|
|
|
|
throw new ImppBusiException(String.format("【%s】此条码已经扫描过,请检查数据!", model.getSn()));
|
|
|
|
|
}
|
|
|
|
|
DdlPackBean packBean = DdlPackBean.getDdlPackBean(model.getOrganizeCode());
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(model.getSn(), "productSn", packBean);
|
|
|
|
|
DdlPreparedPack.getStringEqualPack(model.getSn(), "custSn", packBean);
|
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()}, new String[]{"createDatetime"}, packBean);
|
|
|
|
|
MesProduceSn produceSn = produceSnRepository.getByProperty(packBean);
|
|
|
|
|
if (!StringUtils.isEmpty(produceSn)) {
|
|
|
|
@ -243,7 +243,7 @@ public class mesShippingCheckVolvoRackNoAndPartNoStrategyServiceImpl implements
|
|
|
|
|
|
|
|
|
|
private void updateOrderManagementDetails(MesProduceSn produceSn, MesShippingOrderManagement orderManagement, MesShippingOrderManagementDetail detail, MesWorkOrder workOrder, String userInfo) {
|
|
|
|
|
// if (StringUtils.isEmpty(orderManagement.getCheckSeqCode())) {
|
|
|
|
|
detail.setBarcode(produceSn.getProductSn());
|
|
|
|
|
detail.setBarcode(produceSn.getCustSn());
|
|
|
|
|
detail.setIsScanFlg(MesCommonConstant.TRUE_INTEGER);
|
|
|
|
|
detail.setStatus(MesExtEnumUtil.SHIPPING_ORDER_DETAIL_SHIPPING_STATUS.SHIPPINGED.getValue());
|
|
|
|
|
detail.setRemark("扫描完成");
|
|
|
|
|