Browse Source

问题修改

zhs 2 years ago
parent
commit
29fa1d174d

+ 2 - 2
src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -956,8 +956,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             AskGoods askGoods1 = askGoodsMapper.getWareInfo(askGoods); //要货单数量
             int alreadyNum =  askGoodsMapper.getAskInfoNumVitrual(askGoods);//已扫描总数
             int inventoryAlready =  askGoodsMapper.getInventoryAlready(askGoods);//库存已扫描数量
-            Double inventorySurplus = (Double.parseDouble(inventory.getAmount()) - Double.parseDouble(inventory.getAmountLock())) - inventoryAlready; //库存剩余数量
-            Double surplusNum = Double.parseDouble(askGoods1.getNum()) - Double.parseDouble(askGoods1.getOutNum()) - alreadyNum; //剩余要扫描数量
+            Double inventorySurplus = DateUtil.formatDouble1((Double.parseDouble(inventory.getAmount()) - Double.parseDouble(inventory.getAmountLock())) - inventoryAlready); //库存剩余数量
+            Double surplusNum = DateUtil.formatDouble1(Double.parseDouble(askGoods1.getNum()) - Double.parseDouble(askGoods1.getOutNum()) - alreadyNum); //剩余要扫描数量
 
             if(Double.doubleToLongBits(surplusNum) >= Double.doubleToLongBits(inventorySurplus)){
                 askGoods.setNum(String.valueOf(inventorySurplus));

+ 2 - 2
src/main/resources/mapper/AskGoodsMapper.xml

@@ -276,9 +276,9 @@
                a.num,
                ifnull(a.out_num, 0)    as out_num
         FROM tld_warehouse_transfer a
-                 join tld_material b on a.material_id = b.tld_id
+        join tld_material b on a.material_id = b.tld_id
         where a.warehouse_transfer_id = #{askGoodsId}
-          and b.code = #{wllbCode}
+          and b.code = #{wllbCode} and a.entry_number = #{entryNumber}
     </select>
     <!-- 查询已扫描总数 -->
     <select id="getAskInfoNumVitrual" resultType="int">

+ 1 - 0
src/main/resources/mapper/ReceiveGoodsMapper.xml

@@ -7,6 +7,7 @@
         select
         a.id,
         a.order_code,
+        e.order_number,
         b.name as materialName,
         c.name as supplierName,
         a.purchase_num,