瀏覽代碼

问题修改

zhs 2 年之前
父節點
當前提交
1ab25f8c4a

+ 10 - 0
src/main/java/com/tld/controller/WarehousingController.java

@@ -42,6 +42,16 @@ public class WarehousingController {
     public Map<String, Object> addWarehousingVirtual(@RequestBody WarehousingVirtual warehousingVirtual){
         return warehousingService.addWarehousingVirtual(warehousingVirtual);
     }
+
+    /**
+     * 移库入虚拟表
+     * @param warehousingVirtual
+     * @return
+     */
+    @PostMapping("addWarehouseTransferVirtual")
+    public Map<String, Object> addWarehouseTransferVirtual(@RequestBody WarehousingVirtual warehousingVirtual){
+        return warehousingService.addWarehouseTransferVirtual(warehousingVirtual);
+    }
     /**
      * 库位推荐虚拟表入库
      * @param warehousingVirtual 参数

+ 2 - 0
src/main/java/com/tld/mapper/WarehousingMapper.java

@@ -120,4 +120,6 @@ public interface WarehousingMapper {
     void addInventoryOther(Inventory inventory);
 
     Map<String, Object> getSumWarehousingVirtual(WarehousingVirtual warehousingVirtual);
+
+    Map<String, Object> getWarehouseTransferVirtual(WarehousingVirtual warehousingVirtual);
 }

+ 2 - 0
src/main/java/com/tld/service/WarehousingService.java

@@ -50,4 +50,6 @@ public interface WarehousingService {
     Map<String, Object> getMing(String code);
 
     Map<String, Object> addWarehousingVirtualTwo(WarehousingVirtual warehousingVirtual);
+
+    Map<String, Object> addWarehouseTransferVirtual(WarehousingVirtual warehousingVirtual);
 }

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

@@ -785,7 +785,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                 return map;
             }
             Inventory inventory = askGoodsMapper.getInventory(askGoods); //库存数量
-            if(inventory != null){
+            if(inventory == null){
                 map.put("msg", "500");
                 map.put("errMsg", "暂无库存");
                 return map;

+ 22 - 0
src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -924,6 +924,28 @@ public class WarehousingServiceImpl implements WarehousingService {
         return map;
     }
 
+    @Override
+    public Map<String, Object> addWarehouseTransferVirtual(WarehousingVirtual warehousingVirtual) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            Map<String, Object> mapVal = warehousingMapper.getWarehouseTransferVirtual(warehousingVirtual);
+            Double num = Double.parseDouble(warehousingVirtual.getNum()) + Double.parseDouble(mapVal.get("scanNum").toString());
+            if(Double.doubleToLongBits(Double.parseDouble(mapVal.get("num").toString())) < Double.doubleToLongBits(num)){
+                String surplus = String.valueOf(Double.parseDouble(mapVal.get("num").toString()) - Double.parseDouble(mapVal.get("scanNum").toString()));
+                map.put("msg", "500");
+                map.put("errMsg", "扫描数量超过单据数量,剩余要扫数量" + surplus);
+                return map;
+            }
+            warehousingMapper.addWarehousingVirtual(warehousingVirtual);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常,请稍后再试");
+        }
+        return map;
+    }
+
 
     /**
      * 入库单生成

+ 7 - 0
src/main/resources/mapper/WarehousingMapper.xml

@@ -985,4 +985,11 @@
                (select (qualified_num + 0) - ifnull((warehousing_num + 0), 0) from tld_receive_goods where id = #{receiveGoodsId}) as num
         from dual
     </select>
+    <!-- 查询扫描数量 -->
+    <select id="getWarehouseTransferVirtual" resultType="java.util.Map">
+        select
+            (select ifnull(sum(num), 0) from tld_warehousing_virtual where receive_goods_id = #{receiveGoodsId}) as scanNum,
+            (select (num + 0) - ifnull((out_num + 0), 0) from tld_warehouse_transfer where id = #{receiveGoodsId}) as num
+        from dual
+    </select>
 </mapper>