diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java index dd9de98..fb813ca 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java @@ -10,4 +10,5 @@ public class DeliveryReceiveDetailVo { private String materialSpecName; private double requestQuantity; private double deliveryNum; + private String description; } diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml index 4cd7814..61a874c 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml @@ -448,8 +448,7 @@ LEFT JOIN BS_ERPLOCATION be ON m.ERPLOCATION = be.ERPLOCATIONNAME LEFT JOIN ORG o ON m2.STOCKORGNO = o.ORGNO LEFT JOIN STORAGESPEC sss ON m.LOCATIONNAME = sss.STORAGENAME - WHERE md.DELIVERYNAME = #{deliveryName}) - + WHERE md.DELIVERYNAME = #{deliveryName} AND m2.RECEIVEREQUESTTYPE IN ('Z001', 'Z002', 'Z003','Z004', 'Z005', 'Z006', 'Z007', 'Z008')) SELECT M.DELIVERYNAME, M.MATERIALSPECNAME, M.RECEIVETIME, M.MAKEDATE, @@ -511,12 +510,14 @@ \ No newline at end of file