【越加红】【WMS对接】【寄售退货】

src/main/java/com/uas/eis/service/Impl/DocCommonServiceImpl.java

@@ -98,10 +98,10 @@ public class DocCommonServiceImpl implements DocCommonService {
         StringBuilder sqlBuilder = new StringBuilder();
         if ("in".equals(prodInOut.getPiWmsInType())) {
             sqlBuilder.append("select pd_piid pdPiid,(pd_id) pdId,(pd_pdno) pdPdno,pd_prodcode pdProdcode,pr_detail pdProdname,pr_brand pdBrandName" +
-                    "   ,(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty ,pd_whcode pdWhcode,wh_description pdWhname ")
-                    .append(" from ").append(master).append(".prodiodetail ")
+                    "   ,(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty ,wh_code pdWhcode,wh_description pdWhname ")
+                    .append(" from ").append(master).append(".prodiodetail ").append(" left join ").append(master).append(".prodinout on pi_id = pd_piid ")
                     .append(" left join ").append(master).append(".product on pr_code = pd_prodcode ")
-                    .append(" left join ").append(master).append(".warehouse on wh_Code = pd_whcode ")
+                    .append(" left join ").append(master).append(".warehouse on wh_Code = (case when pi_class='拨出单' and PI_TYPE='寄售退货' then pd_inwhcode else pd_whcode end) ")
                     .append(" where pd_piid = "+prodInOut.getPiId()+" and nvl(pr_sendwmsflag,0) = -1 ")
                     .append(" order by pd_pdno ");
         } else {