diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java index 761fdba..85b2f30 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java @@ -177,7 +177,7 @@ public class MaterialReceiveActController { String receiveQty = box.getRECEIVEDQUANTITY2();//实收数量 String receiveRequestDetailName = box.getReceiveRequestDetailName(); // 单据 - String receiveRequestName = box.getReceiveRequestName(); + String receiveRequestName = boxs.getReceiveRequestName(); // 判断是否是倒库单据 MaterialReceiveRequest byKey = deliveryService.getByKey(boxs.getSiteName(), boxs.getReceiveRequestName()); if (byKey.getReceiveRequestType().equals(ReceiveTypeEnums.DK.getCode())) { @@ -185,9 +185,7 @@ public class MaterialReceiveActController { List collect = deliveryService.getReceiveByDelivery(boxs.getSiteName(), boxs.getReceiveRequestName()) .stream().filter(item -> item.getMaterialSpecName().equals(materialSpecName)).collect(Collectors.toList()); // 检查剩余数量 -// if () { -// -// } + // @TODO } String remark = box.getRemark(); String sdkid = box.getSdkid() == null ? "" : box.getSdkid();