问题修改

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

@@ -1,13 +1,10 @@
 package com.tld.controller;
 
-import com.tld.mapper.WarehousingMapper;
 import com.tld.model.AskGoods;
-import com.tld.model.ReceiveGoods;
 import com.tld.service.AskGoodsService;
 import com.tld.util.PassToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;

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

@@ -64,5 +64,5 @@ public interface DeliveryMapper {
 
     List<Delivery> getDeliveryCode(Delivery delivery);
 
-    List<Delivery> getDeliveryProjectName(Delivery delivery);
+    List<String> getDeliveryProjectName(Delivery delivery);
 }

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

@@ -205,7 +205,7 @@ public class DeliveryServiceImpl implements DeliveryService {
                     //查询设备绑定的
                     List<Map<String, Object>> list1 = deliveryMapper.getEquipmentSoftware(materialClass.getCode());
                     //如果设备绑定软件基础信息有数据则继续往下执行
-                    if(list.size() != 0){
+                    if(list1.size() != 0){
                         Map<String, Object> map1 = list1.get(0);
                         Delivery delivery1 = new Delivery()
                                 .setDeliveryId(deliveryId)
@@ -371,7 +371,7 @@ public class DeliveryServiceImpl implements DeliveryService {
     public Map<String, Object> getDeliveryName(Delivery delivery) {
         Map<String, Object> map = new HashMap<>();
         try {
-            List<Delivery> list = deliveryMapper.getDeliveryProjectName(delivery);
+            List<String> list = deliveryMapper.getDeliveryProjectName(delivery);
             map.put("data", list);
             map.put("msg", "200");
         } catch (Exception e) {

src/main/resources/mapper/AskGoodsMapper.xml

@@ -601,7 +601,7 @@
     <delete id="delPlugOutWarehousing">
         delete
         from tld_return_gs_warehousing
-        where order_number = #{orderNumber} LIKE CONCAT('%', CONCAT(order_number, ','), '%')
+        where #{orderNumber} LIKE CONCAT('%', CONCAT(order_number, ','), '%')
     </delete>
     <!-- 修改出库数量 -->
     <update id="updateOutNum">

src/main/resources/mapper/DeliveryMapper.xml

@@ -14,9 +14,10 @@
         WHERE
             ( a.gs_delivery_num - a.gs_cancel_num ) != a.out_num
 	AND a.STATUS != '1' and c.code in (select material_id from tld_user_material where user_id = #{userId})
+    AND b.project_name = #{projectName}
     </select>
     <!-- 查询销售单项目名称 -->
-    <select id="getDeliveryProjectName" resultType="com.tld.model.Delivery">
+    <select id="getDeliveryProjectName" resultType="String">
         SELECT
             DISTINCT b.project_name as name
         FROM
@@ -319,7 +320,7 @@
             tld_ask_goods_vitrual a
             join tld_material b on a.wllb_code = b.code
         WHERE
-            a.ask_goods_id = #{deliveryId} and b.tld_id = #{materialId}
+            a.ask_goods_id = #{deliveryId} and b.tld_id = #{materialId} and a.entry_number = #{entryNumber}
     </select>
     <!-- 新增半成品流水 -->
     <insert id="addRemovalHalfProduct">
@@ -351,7 +352,7 @@
     <!-- 查询销售单绑定的软件类 -->
     <select id="getEquipmentSoftware" resultType="java.util.Map">
         select
-            a.equipment_code as equipmentCode
+            a.equipment_code as equipmentCode,
             a.software_code as softwareCode,
             b.tld_id as materialId
         from tld_equipment_binding_software a