|
|
@ -120,8 +120,8 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
|
|
|
|
// if (!StringUtil.isEmpty(bean.orderBy())) {
|
|
|
|
// if (!StringUtil.isEmpty(bean.orderBy())) {
|
|
|
|
// packBean.setOrderByStr(bean.orderBy());
|
|
|
|
// packBean.setOrderByStr(bean.orderBy());
|
|
|
|
// } else {
|
|
|
|
// } else {
|
|
|
|
//顺序校验 根据未扫描单号 1 、2 、3,如果没有强过码 必须先扫1 再扫2
|
|
|
|
//顺序校验 根据未扫描单号 1 、2 、3,如果没有强过码 必须先扫1 再扫2 pullingOrderNo修改位workOrderNo
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"pullingOrderNo"}, packBean);
|
|
|
|
DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"workOrderNo"}, packBean);
|
|
|
|
// }
|
|
|
|
// }
|
|
|
|
List<MesPullingOrderInfo> pullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBean);
|
|
|
|
List<MesPullingOrderInfo> pullingOrderInfos = mesPullingOrderInfoRepository.findByHqlWhere(packBean);
|
|
|
|
if (!CollectionUtils.isEmpty(pullingOrderInfos)) {
|
|
|
|
if (!CollectionUtils.isEmpty(pullingOrderInfos)) {
|
|
|
|