|
@@ -252,7 +252,7 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" sh.cSOCode AS orderNum, " +
|
|
|
" c.cInvName AS poStyleNum, " +
|
|
|
" sum(shs.iTaxUnitPrice) AS exportUnitPrice , " +
|
|
|
- " so.supplierCode AS processUnit " +
|
|
|
+ " v.cVenName AS processUnit " +
|
|
|
"FROM " +
|
|
|
" SaleBillVouch sh " +
|
|
|
" JOIN SaleBillVouchs shs ON sh.SBVID = shs.SBVID " +
|
|
@@ -270,7 +270,8 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
|
|
|
" WHERE om.cState = 1 AND om.cCode LIKE '"+plannum+"%' " +
|
|
|
" ) o ON s.isosid = o.isosid AND s.cInvCode = o.cInvCode " +
|
|
|
" ) so ON so.iSOsID = rd.iorderdid "+
|
|
|
- " group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName,so.supplierCode";
|
|
|
+ " LEFT JOIN Vendor v ON so.supplierCode= v.cVenCode "+
|
|
|
+ " group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName ";
|
|
|
//" WHERE sh.cSOCode = '"+syCostAllocation.getGarmentContractno()+"'";
|
|
|
List<Map<String, Object>> listShipdetail = senYuDataSourceOne.queryForList(sqlShipdetail);
|
|
|
List<JSONObject> Shipdetail = JsonChangeUtils.toJSONObject(listShipdetail);
|