diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 60cae812..52e46cbc 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -389,7 +389,6 @@ public class StructuralPackageOrderController extends BaseController { .setPackagingType((short) 0) .setQuantity(BigDecimal.valueOf(it.getNum())) .setUnit(it.getUnit()) - .setSupplierId(it.getSupplierId()) .setPoNumber(it.getExternalOrderNo()) .setPoLineNumber(it.getRowNo()) .setExtendId(it.getId()) @@ -1205,15 +1204,14 @@ public class StructuralPackageOrderController extends BaseController { List items = structuralPackageOrderTrayItemService.getList(request.getId()); items.forEach(it -> it.setStoreNum(it.getShipmentNum())); structuralPackageOrderTrayItemService.updateBatchById(items); - if (structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()) == 2) { - qrCodeMasterService.lambdaUpdate() - .set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) - .set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId()) - .set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName()) - .set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now()) - .eq(WmsQrCodeMaster::getExtendId, request.getId()) - .update(); - } + structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()); + qrCodeMasterService.lambdaUpdate() + .set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState()) + .set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId()) + .set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName()) + .set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now()) + .eq(WmsQrCodeMaster::getExtendId, request.getId()) + .update(); WmsStructuralPackageDeliverOrderMap om = structuralPackageDeliverOrderMapService.lambdaQuery() .eq(WmsStructuralPackageDeliverOrderMap::getOrderId, request.getId()) .one();