diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java index 66895c1c..05b43bed 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOrderServiceImpl.java @@ -2126,7 +2126,6 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { return orderList1; }else { //二维码获取的信息查询对应的sap生产订单,再用生产订单查询子单 - List orderLists=new ArrayList<>(); List orderListone= odsProcureOutOrderMapper.selectWmsOdsProcureOutOrder(odsProcureOutOrder); if (orderListone.size()>0){ @@ -2866,7 +2865,7 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setMaterialDesc(materialDesc); order.setUserDefined1(userDefined2);//批次 order.setUserDefined2(whCode); - order.setUserDefined3(wlCode); + order.setUserDefined3(sn); order.setSn(sn); order.setPlanNumber(amount); order.setLocCode(waCode);//库区 @@ -2879,9 +2878,9 @@ public class OdsProcureOrderServiceImpl implements IOdsProcureOrderService { order.setSiteCode(factoryCode); odsProcureOutOrderMapper.insertWmsRawMissionOut(order); BigDecimal returnNumber= order1.getReturnNumber(); - order1.setReturnNumber(returnNumber.add(amount)); + order1.setReturnNumber(returnNumber.add(amount));// if(order1.getPlanNumber().compareTo(order1.getReturnNumber())<=0){ - order1.setOrderStatus("3"); + order1.setOrderStatus("3");// }else { order1.setOrderStatus("2"); }