Merge remote-tracking branch 'origin/master'

master
元气满满(jgy) 5 months ago
commit bc28d92c76

@ -1487,9 +1487,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder); List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder);
if (orderListone.size()>0){ if (orderListone.size()>0){
for (OdsProcureOutOrder order:orderListone){ for (OdsProcureOutOrder order:orderListone){
if (!"3".equals(order.getOrderStatus())){ // if (!"3".equals(order.getOrderStatus())){
orderLists.add(order); orderLists.add(order);
} // }
} }
return orderLists; return orderLists;
} }
@ -1540,9 +1540,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService {
List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder); List<OdsProcureOutOrder> orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder);
if (orderListone.size()>0){ if (orderListone.size()>0){
for (OdsProcureOutOrder order:orderListone){ for (OdsProcureOutOrder order:orderListone){
if (!"3".equals(order.getOrderStatus())){ // if (!"3".equals(order.getOrderStatus())){
orderLists.add(order); orderLists.add(order);
} // }
} }
return orderLists; return orderLists;
} }

Loading…
Cancel
Save