|
|
@@ -165,8 +165,11 @@ public class ErpServiceImpl implements ErpService {
|
|
|
}
|
|
|
SqlRowList rs = baseDao.queryForRowSet("select pi_id,pi_class,pi_inoutno,pi_whcode,pr_brand,pr_detail,pd_prodcode,pd_orderprice,pi_currency,pr_spec,pd_ordercode," +
|
|
|
"pd_orderdetno,pi_inoutno,pd_pdno,pd_inqty,pd_outqty,pd_needcheck,pr_needserialnumber,ba_ordercode,to_char(ba_date,'yyyy-MM-dd') ba_date," +
|
|
|
- "ba_orderdetno,nvl(pr_ts_user,0) pr_ts_user from prodinout left join ProdIODetail on pd_piid=pi_id left join Product on pd_prodcode = pr_code " +
|
|
|
- "left join batch on ba_code=pd_batchcode and pd_prodcode=ba_prodcode and pd_whcode=ba_whcode where pi_id=" + id+" order by pd_pdno");
|
|
|
+ "ba_orderdetno,nvl(pr_ts_user,0) pr_ts_user,sd_custprodcode " +
|
|
|
+ " from prodinout left join ProdIODetail on pd_piid=pi_id left join Product on pd_prodcode = pr_code " +
|
|
|
+ " left join batch on ba_code=pd_batchcode and pd_prodcode=ba_prodcode and pd_whcode=ba_whcode " +
|
|
|
+ " left join saledetail on pi_class='出货单' and sd_code=pd_ordercode and sd_detno=pd_orderdetno" +
|
|
|
+ " where pi_id=" + id+" order by pd_pdno");
|
|
|
while (rs.next()) {
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
//物料编码
|
|
|
@@ -186,8 +189,9 @@ public class ErpServiceImpl implements ErpService {
|
|
|
data.put("needSerialNumber",rs.getGeneralInt("pr_needserialnumber"));
|
|
|
//序号
|
|
|
data.put("seqNum",rs.getGeneralInt("pd_pdno"));
|
|
|
-
|
|
|
-
|
|
|
+ if("出货单".equals(rs.getString("pi_class"))){
|
|
|
+ data.put("outerMaterialCode",rs.getString("sd_custprodcode"));
|
|
|
+ }
|
|
|
if(isOut){
|
|
|
//数量
|
|
|
data.put("materialNumber",rs.getGeneralDouble("pd_outqty"));
|