Skip to content

S
shop
Commit a7d3b9ea authored by 张永's avatar 张永
Browse files
Options

V1.1.7.5

parent 7c967377
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/main/java/com/egolm/shop/api/service/impl/GoodsServiceImpl.java
View file @ a7d3b9ea
......@@ -498,7 +498,7 @@ public class GoodsServiceImpl implements GoodsService {
if(IsGoodsUnit == 1) {
//查询多单位
String GoodsUnitSql = " select t.nGoodsID, sUnitTypeID = 'SaleMin', sUnitType = '销售小单位', nConvertRate = 1, " +
" t.sUnit, t.nRealSalePrice, t.nSalePrice, "
" t.sUnit,sMinUnit = t.sUnit, t.nRealSalePrice, t.nSalePrice, "
+ " t.sSpec, t.nMinSaleQty, t.nSaleUnits, t.nStockQty, t.sStockTag, " +
" sShowUnit = convert(varchar,convert(numeric(12,2),t.nRealSalePrice)) + '元/' + t.sUnit + ' (1' + t.sUnit + ')' " +
" from V_OrgGoods t " +
......@@ -508,7 +508,7 @@ public class GoodsServiceImpl implements GoodsService {
" and t.nAgentID = ?" +
" union " +
" select t.nGoodsID, gu.sUnitTypeID, gu.sUnitType, gu.nConvertRate, " +
" gu.sUnit, nRealSalePrice = gu.nSalePrice, gu.nSalePrice, "
" gu.sUnit,sMinUnit = t.sUnit, nRealSalePrice = gu.nSalePrice, gu.nSalePrice, "
+ " t.sSpec + '*' + dbo.fn_GetConvertDec(gu.nConvertRate), nMinSaleQty = 1, nSaleUnits = 1, nStockQty = cast(t.nStockQty/gu.nConvertRate as int), t.sStockTag, " +
" 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 " +
......
src/main/resources/templates/redmine.html
View file @ a7d3b9ea
......@@ -24,10 +24,10 @@
</head>
<body>
<div id="app">
<el-divider content-position="left">V1.1.7.5 2024-4-22</el-divider>
<el-divider content-position="left">V1.1.7.5 2024-4-23</el-divider>
<p class="title">1.增加接口签名验证及开关</p>
<p class="title">2.需求 #16555、需求 #16563 需求 #16542,需求 #16595</p>
<p class="title">3.需求 #16680，需求 #16747</p>
<p class="title">3.需求 #16680，需求 #16747 需求 #16766</p>
<el-divider content-position="left">V1.1.7.4 2024-3-1</el-divider>
<p class="title">1.将日志写入SqlServer LGODB的idcSystemLog,一月一表: idcSystemLog_yyyyMM</p>
<p class="title">2.读写分离拆分 需求 #16467</p>
......
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