Commit b90e800d authored by 张永's avatar 张永

需求 #15246

parent 3c62fd09
...@@ -266,7 +266,7 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -266,7 +266,7 @@ public class GoodsServiceImpl implements GoodsService {
//商品详情再增加一个集合输出多单位信息 需求 #15246 //商品详情再增加一个集合输出多单位信息 需求 #15246
if(IsGoodsUnit == 1) { if(IsGoodsUnit == 1) {
String GoodsUnitSql = "select sUnitTypeID = 'SaleMin', sUnitType = '销售小单位', nConvertRate = 1, " + String GoodsUnitSql = "select sUnitTypeID = 'SaleMin', sUnitType = '销售小单位', nConvertRate = 1, " +
" t.sUnit, t.nRealSalePrice, " + " t.sUnit, t.nRealSalePrice, t.sSpec, t.nMinSaleQty, t.nSaleUnits, " +
" sShowUnit = convert(varchar,convert(numeric(12,2),t.nRealSalePrice)) + '元/' + t.sUnit + ' (1' + t.sUnit + ')'" + " sShowUnit = convert(varchar,convert(numeric(12,2),t.nRealSalePrice)) + '元/' + t.sUnit + ' (1' + t.sUnit + ')'" +
" from V_OrgGoods t " + " from V_OrgGoods t " +
" where t.sOrgNO = ?" + " where t.sOrgNO = ?" +
...@@ -275,7 +275,7 @@ public class GoodsServiceImpl implements GoodsService { ...@@ -275,7 +275,7 @@ public class GoodsServiceImpl implements GoodsService {
" and t.nAgentID = ?" + " and t.nAgentID = ?" +
" union " + " union " +
" select gu.sUnitTypeID, gu.sUnitType, gu.nConvertRate, " + " select gu.sUnitTypeID, gu.sUnitType, gu.nConvertRate, " +
" gu.sUnit, nRealSalePrice = gu.nSalePrice, " + " gu.sUnit, nRealSalePrice = gu.nSalePrice, t.sSpec + '*' + dbo.fn_GetConvertDec(gu.nConvertRate), nMinSaleQty = 1, nSaleUnits = 1, " +
" sShowUnit = convert(varchar,gu.nSalePrice) + '元/' + gu.sUnit + ' (' + dbo.fn_GetConvertDec(gu.nConvertRate) + t.sUnit + ')'" + " sShowUnit = convert(varchar,gu.nSalePrice) + '元/' + gu.sUnit + ' (' + dbo.fn_GetConvertDec(gu.nConvertRate) + t.sUnit + ')'" +
" from V_OrgGoods t join tAgentGoodsUnit gu on gu.nAgentID = t.nAgentID " + " from V_OrgGoods t join tAgentGoodsUnit gu on gu.nAgentID = t.nAgentID " +
" and gu.nGoodsID = t.nGoodsID " + " and gu.nGoodsID = t.nGoodsID " +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment