10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr

Browse Source
This commit is contained in:
郭飞 2025-05-29 14:19:26 +08:00
commit f3e73f6c25
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zi-wms-pda/src/main/java/com/cim/idm/model/vo/DeliveryReceiveDetailVo.java
View File

@ -10,4 +10,5 @@ public class DeliveryReceiveDetailVo {
private String materialSpecName;
private double requestQuantity;
private double deliveryNum;
private String description;
}

13
zi-wms-pda/src/main/resources/com/cim/idm/dao/DeliveryDao.xml
View File

@ -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 @@
</update>
<select id="getDeliveryReceiveDetail" resultType="com.cim.idm.model.vo.DeliveryReceiveDetailVo">
SELECT receiveRequestName, materialSpecName, requestQuantity, requestQuantity - receivedQuantity as deliveryNum, RECEIVEREQUESTDETAILNAME
FROM MATERIALRECEIVEREQUESTDETAIL
WHERE RECEIVEREQUESTNAME in
SELECT RD.receiveRequestName, RD.materialSpecName, RD.requestQuantity, RD.requestQuantity - RD.receivedQuantity as deliveryNum, RD.RECEIVEREQUESTDETAILNAME
,MS.DESCRIPTION AS description
FROM MATERIALRECEIVEREQUESTDETAIL RD
LEFT JOIN MATERIALSPEC MS ON RD.MATERIALSPECNAME = MS.MATERIALSPECNAME
WHERE RD.RECEIVEREQUESTNAME in
<foreach item="name" index="index" collection="nameList" open="(" separator="," close=")">
#{name}
</foreach>
order by RECEIVEREQUESTDETAILNAME
order by RD.RECEIVEREQUESTDETAILNAME
</select>
</mapper>