pda生产退库

src/main/resources/mapper/production/ToolDetailMapper.xml

@@ -23,14 +23,13 @@
             ISNULL(uh.usageCnt,0) AS cumulativeUseCount,
             ISNULL(ih.inspectCnt,0) AS repairCount,
             CASE
-                WHEN ISNULL(td.EstUseQty,0) <= 0 THEN N''
-                WHEN CAST(ISNULL(uh.usageCnt,0) AS FLOAT) >= ISNULL(td.EstUseQty,0) * 0.9 THEN N'请及时维修（使用次数≥寿命90%）'
+                WHEN ISNULL(td.EstUseQty,0) = 0 THEN N''
                 WHEN ISNULL(td.ActualUseQty,0) >= ISNULL(td.EstUseQty,0) * 0.9 THEN N'请及时维修（实际用量≥寿命90%）'
                 ELSE N''
             END AS repairReminder,
             CASE
                 WHEN ISNULL(td.EstUseQty,0) <= 0 THEN NULL
-                ELSE ROUND(100.0 * ISNULL(uh.usageCnt,0) / NULLIF(td.EstUseQty,0), 1)
+                ELSE ROUND(100.0 * ISNULL(td.ActualUseQty,0) / NULLIF(td.EstUseQty,0), 1)
             END AS lifespanUsagePercent
         FROM ToolDetail td WITH (NOLOCK)
         INNER JOIN ToolHeader th WITH (NOLOCK) ON th.Site = td.Site AND th.ToolID = td.ToolID

src/main/resources/templates/pdaOther/bagStockOtherOut.ftl

@@ -69,7 +69,7 @@
 	</header>
 
 	<!-- 袋装扫码：site;partNo;print_qty;seqNo;item_no;tcp - rqrq -->
-	<div autocomplete="off"  style="margin-left: 15px;width: 200px;height: 24px;margin-top: -10px;">
+	<div autocomplete="off"  style="margin-left: 27px;width: 90px;height: 24px;margin-top: -10px;">
 		<label class="ivu-form-item-label" >请扫描袋装标签</label>
 	</div>