问题修改

src/main/java/com/tld/config/SaticScheduleTask.java

@@ -62,4 +62,12 @@ public class SaticScheduleTask {
     public void callWorkOrder(){
         askGoodsService.getCallWorkOrder();
     }
+
+    /**
+     * 量回调 销售出库
+     */
+    @Scheduled(cron = "0 */10 * * * ?")
+    public void callDelivery(){
+        askGoodsService.callDelivery();
+    }
 }

src/main/java/com/tld/controller/DeliveryController.java

@@ -88,8 +88,8 @@ public class DeliveryController {
      * @return 返回结果
      */
     @GetMapping("OutOfLibrary")
-    public Map<String, Object> OutOfLibrary(String uniqueCode, String type, String deliveryId){
-        return deliveryService.OutOfLibrary(uniqueCode, type, deliveryId);
+    public Map<String, Object> OutOfLibrary(String uniqueCode, String type, String deliveryId, String realName){
+        return deliveryService.OutOfLibrary(uniqueCode, type, deliveryId, realName);
     }
 
     /**

src/main/java/com/tld/mapper/AskGoodsMapper.java

@@ -254,5 +254,7 @@ public interface AskGoodsMapper {
 
     List<Map<String, Object>> getCallWorkOrder();
 
+    List<ReturRemoval> callDelivery();
+
     void DelOutgoingReturnList(OutgoingReturn outgoingReturn);
 }

src/main/java/com/tld/model/Delivery.java

@@ -167,4 +167,8 @@ public class Delivery implements Serializable {
      * 名称
      */
     private String name;
+    /**
+     * 排序
+     */
+    private String groupBy;
 }

src/main/java/com/tld/service/AskGoodsService.java

@@ -114,4 +114,6 @@ public interface AskGoodsService {
     void getCallPlugOutWarehousing();
 
     void getCallWorkOrder();
+
+    void callDelivery();
 }

src/main/java/com/tld/service/DeliveryService.java

@@ -12,7 +12,7 @@ public interface DeliveryService {
 
     Map<String, Object> getRecommend(Delivery delivery);
 
-    Map<String, Object> OutOfLibrary(String uniqueCode, String type, String deliveryId);
+    Map<String, Object> OutOfLibrary(String uniqueCode, String type, String deliveryId, String realName);
 
     Map<String, Object> getAttribute(Delivery delivery);
 

src/main/java/com/tld/service/impl/AskGoodsServiceImpl.java

@@ -2020,6 +2020,16 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         }
     }
 
+    @Override
+    public void callDelivery() {
+        List<ReturRemoval> list = askGoodsMapper.callDelivery();
+        if(list.size() != 0) {
+            for(ReturRemoval returRemoval : list){
+                plugOutRemoval(returRemoval.getRemovalCode(), returRemoval.getName());
+            }
+        }
+    }
+
     @Override
     public void getCallback() {
         List<ReturRemoval> list = askGoodsMapper.getCallback();

src/main/java/com/tld/service/impl/DeliveryServiceImpl.java

@@ -2,10 +2,7 @@ package com.tld.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.tld.mapper.AskGoodsMapper;
-import com.tld.mapper.DeliveryMapper;
-import com.tld.mapper.DictionaryMapper;
-import com.tld.mapper.WarehousingMapper;
+import com.tld.mapper.*;
 import com.tld.model.*;
 import com.tld.service.DeliveryService;
 import com.tld.util.DateUtil;
@@ -35,6 +32,9 @@ public class DeliveryServiceImpl implements DeliveryService {
     //入库
     @Autowired
     private WarehousingMapper warehousingMapper;
+    //查询信息
+    @Autowired
+    private QueryListMapper queryListMapper;
 
     @Override
     public Map<String, Object> getDelivery(Delivery delivery) {
@@ -42,12 +42,25 @@ public class DeliveryServiceImpl implements DeliveryService {
         try{
             List<Delivery> list = deliveryMapper.getDelivery(delivery);
             Map<String, Object> mapVal = new HashMap<>();
+            Map<String, Object> mapInventoryVal = new HashMap<>();
             for(Delivery delivery1 : list){
                 String sumScan = deliveryMapper.getScanSum(delivery1);
+                Inventory inventory = new Inventory()
+                        .setWbs(delivery1.getWbs())
+                        .setCompanyCode(delivery1.getCompanyNumber())
+                        .setMaterialId(delivery1.getMaterialId())
+                        .setGroupBy(delivery.getGroupBy());
+                List<Map<String, Object>> mapInventory = queryListMapper.storageLocation(inventory);
+                String amount = "0";
+                if(mapInventory.size() != 0){
+                    amount = mapInventory.get(0).get("sum").toString();
+                }
                 mapVal.put(delivery1.getDeliveryId() + delivery1.getMaterialId() + delivery1.getEntryNumber(), sumScan);
+                mapInventoryVal.put(delivery1.getDeliveryId() + delivery1.getMaterialId() + delivery1.getEntryNumber(), DateUtil.formatDouble1((Double.parseDouble(amount) - Double.parseDouble(sumScan))));
             }
             map.put("data", list);
             map.put("scan", mapVal);
+            map.put("inventory", mapInventoryVal);
             map.put("msg", "200");
         }catch (Exception e) {
             map.put("msg", "500");
@@ -138,7 +151,7 @@ public class DeliveryServiceImpl implements DeliveryService {
     }
 
     @Override
-    public Map<String, Object> OutOfLibrary(String uniqueCode, String type, String deliveryId) {
+    public Map<String, Object> OutOfLibrary(String uniqueCode, String type, String deliveryId, String realName) {
         Map<String, Object> map = new HashMap<>();
         //redis并发锁
         RLock lock = redissonClient.getLock(uniqueCode);
@@ -258,6 +271,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                         .setSourceType(delivery.getSourceType())
                         .setMoveType(delivery.getMoveType())
                         .setDeliveryType(delivery.getDeliveryType());
+                        .setName(realName);
                 askGoodsMapper.addReturnGsRemovalF(returRemoval1);//新增返回gs数据父表信息
             }
             map.put("data", removalCode);

src/main/resources/mapper/AskGoodsMapper.xml

@@ -1755,4 +1755,11 @@
         update tld_error_excel_parking set order_number = #{orderNumber} , material_code = #{materialCode} , num = #{num} , classify = #{classify}
         where id = #{id}
     </update>
+    <!-- 查询销售单出库 -->
+    <select id="callDelivery">
+        select
+            removal_code as removalCode,
+            ifnull(name, '李兆峰') as name
+        from tld_return_gs_removal where delivery_type  <![CDATA[=]]> 'DE'
+    </select>
 </mapper>

src/main/resources/mapper/QueryListMappeer.xml

@@ -183,7 +183,8 @@
             c.code as code,
             e.name as supplierName,
             a.wbs,
-            a.account_sleeve
+            a.account_sleeve,
+            h.name as wbsName
         FROM
         tld_inventory a
         LEFT JOIN tld_storage_location b ON a.storage_location_code = b.storage_location_code

src/main/resources/mapper/WarehousingMapper.xml

@@ -1190,7 +1190,7 @@
     </update>
     <!-- 查询库存是否存在此产成品 -->
     <select id="getFinishedInfo" resultType="String">
-        select id from tld_inventory where wllb_code = #{wllbCode} and wbs = #{wbs} and account_sleeve = #{accountSleeve} limit 1
+        select max(id) from tld_inventory where wllb_code = #{wllbCode} and wbs = #{wbs} and account_sleeve = #{accountSleeve} limit 1
     </select>
     <!-- 查询产成品入库虚拟表数量 -->
     <select id="getnumSaoMiao" resultType="java.lang.String">