问题修改

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

@@ -6,6 +6,7 @@ import com.tld.service.AskGoodsService;
 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;
 
@@ -167,4 +168,14 @@ public class AskGoodsController {
         return askGoodsService.otherAskGoods(askGoods);
     }
 
+    /**
+     * 删除生产领料
+     * @param id 参数
+     * @return 返回结果
+     */
+    @DeleteMapping("delAskGoods")
+    public Map<String, Object> delAskGoods(String id, HttpServletRequest request){
+        return askGoodsService.delAskGoods(id, request);
+    }
+
 }

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

@@ -63,7 +63,7 @@ public class DictionaryController {
      * @return 返回结果
      */
     @DeleteMapping("deleteDictionary")
-    public Map<String, Object> deleteDictionary(Dictionary dictionary){
-        return dictionaryService.deleteDictionary(dictionary);
+    public Map<String, Object> deleteDictionary(Dictionary dictionary, HttpServletRequest request){
+        return dictionaryService.deleteDictionary(dictionary, request);
     }
 }

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

@@ -5,6 +5,7 @@ import com.tld.service.InviteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -65,4 +66,14 @@ public class InviteController {
     public Map<String, Object> OutOfLibrary(String uniqueCode, String type, String askGoodsId){
         return inviteService.OutOfLibrary(uniqueCode, type, askGoodsId);
     }
+
+    /**
+     * 删除非生产领料
+     * @param id 参数
+     * @return 返回结果
+     */
+    @DeleteMapping("delAskGoods")
+    public Map<String, Object> delAskGoods(String id, HttpServletRequest request){
+        return inviteService.delAskGoods(id, request);
+    }
 }

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

@@ -63,7 +63,7 @@ public class ReceiveGoodsController {
      * @param id 参数
      * @return 返回结果
      */
-    @PutMapping("delReceiveGoods")
+    @DeleteMapping("delReceiveGoods")
     public Map<String, Object> delReceiveGoods(String id, HttpServletRequest request){
         return receiveGoodsSerivce.delReceiveGoods(id, request);
     }

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

@@ -102,4 +102,7 @@ public interface AskGoodsMapper {
 
     void delPlugOutWarehousing(@Param("orderNumber") String orderNumber);
 
+    Map<String, Object> getDelAskGoods(String id);
+
+    void delAskGoods(String id);
 }

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

@@ -88,4 +88,7 @@ public interface InviteMapper {
 
     void addDeliverys(Map<String, Object> list);
 
+    Map<String, Object> getDelAskGoods(String id);
+
+    void delAskGoods(String id);
 }

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

@@ -2,6 +2,7 @@ package com.tld.service;
 
 import com.tld.model.AskGoods;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
@@ -40,4 +41,6 @@ public interface AskGoodsService {
     void getRemovalHalfExcel(AskGoods askGoods, HttpServletResponse response);
 
     Map<String, Object> otherAskGoods(AskGoods askGoods);
+
+    Map<String, Object> delAskGoods(String id, HttpServletRequest request);
 }

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

@@ -15,7 +15,7 @@ public interface DictionaryService {
 
     Map<String, Object> updateDictionary(Dictionary dictionary, HttpServletRequest request);
 
-    Map<String, Object> deleteDictionary(Dictionary dictionary);
+    Map<String, Object> deleteDictionary(Dictionary dictionary, HttpServletRequest request);
 
     Map<String, Object> addDiction(Dictionary dictionary, HttpServletRequest request);
 }

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

@@ -2,6 +2,7 @@ package com.tld.service;
 
 import com.tld.model.AskGoods;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -24,4 +25,6 @@ public interface InviteService {
     Map<String, Object> deliveryOrder(List<Map<String, Object>> mapList);
 
     Map<String, Object> transferNotice(List<Map<String, Object>> mapList);
+
+    Map<String, Object> delAskGoods(String id, HttpServletRequest request);
 }

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -617,6 +618,29 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         return map;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> delAskGoods(String id, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            String userId = request.getHeader("userId");
+            Map<String, Object> mapVal = askGoodsMapper.getDelAskGoods(id);
+            LogData logData = new LogData()
+                    .setUserId(userId)
+                    .setData(mapVal.toString())
+                    .setType("0")
+                    .setDocumentType("生产领料");
+            dictionaryMapper.addLogdata(logData);
+            askGoodsMapper.delAskGoods(id);
+            map.put("msg","200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("status", "500");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 出库单生成
      * @return

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

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import com.tld.mapper.DictionaryMapper;
 import com.tld.model.Access;
 import com.tld.model.Goods;
+import com.tld.model.LogData;
 import com.tld.service.DictionaryService;
 import com.tld.util.RedisUtil;
 import org.apache.poi.ss.formula.functions.T;
@@ -150,9 +151,10 @@ public class DictionaryServiceImpl implements DictionaryService {
     }
 
     @Override
-    public Map<String, Object> deleteDictionary(Dictionary dictionary) {
+    public Map<String, Object> deleteDictionary(Dictionary dictionary, HttpServletRequest request) {
         Map<String, Object> map = new HashMap<>();
         try{
+            String userId = request.getHeader("userId");
             String tableName = dictionaryMapper.getTableName(dictionary.getType());
             if ("null".equals(tableName)) {
                 map.put("msg", "500");
@@ -160,6 +162,13 @@ public class DictionaryServiceImpl implements DictionaryService {
                 return map;
             }
             dictionary.setTableName(tableName);
+            List<Dictionary> list = dictionaryMapper.getDictionary(dictionary);
+            LogData logData = new LogData()
+                    .setUserId(userId)
+                    .setData(list.toString())
+                    .setType("0")
+                    .setDocumentType(dictionary.getType());
+            dictionaryMapper.addLogdata(logData);
             dictionaryMapper.deleteDictionary(dictionary);
             map.put("msg", "200");
         }  catch (Exception e){

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -263,6 +264,29 @@ public class InviteServiceImpl implements InviteService {
         return map;
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> delAskGoods(String id, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            String userId = request.getHeader("userId");
+            Map<String, Object> mapVal = inviteMapper.getDelAskGoods(id);
+            LogData logData = new LogData()
+                    .setUserId(userId)
+                    .setData(mapVal.toString())
+                    .setType("0")
+                    .setDocumentType("非生产领料");
+            dictionaryMapper.addLogdata(logData);
+            inviteMapper.delAskGoods(id);
+            map.put("msg","200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("status", "500");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 出库单生成
      * @return

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

@@ -204,7 +204,7 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
                     .setUserId(userId)
                     .setData(mapVal.toString())
                     .setType("0")
-                    .setDocumentType("单据类型");
+                    .setDocumentType("质检单");
             dictionaryMapper.addLogdata(logData);
             receiveGoodsMapper.delReceiveGoods(id);
             map.put("msg","200");

src/main/resources/mapper/AskGoodsMapper.xml

@@ -590,4 +590,12 @@
         WHERE
             a.document_id = #{removalCode}
     </select>
+    <!-- 查询要料申请单 -->
+    <select id="getDelAskGoods" resultType="java.util.Map">
+        select * from tld_ask_goods where id = #{id}
+    </select>
+    <!-- 删除生产领料 -->
+    <delete id="delAskGoods">
+        delete from tld_ask_goods where id = #{id}
+    </delete>
 </mapper>

src/main/resources/mapper/DictionaryMapper.xml

@@ -29,6 +29,9 @@
             <if test="tldId != null and tldId != ''">
                 and tld_id = #{tldId}
             </if>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
         </trim>
     </select>
     <!-- 查询字典内容分页 -->

src/main/resources/mapper/InviteMapper.xml

@@ -458,4 +458,12 @@
         update tld_invite
         set out_num = ifnull(out_num,0) + #{num} where material_id = #{materialId} and ask_goods_id = #{askGoodsId}
     </update>
+    <!-- 查询要料申请单 -->
+    <select id="getDelAskGoods" resultType="java.util.Map">
+        select * from tld_invite where id = #{id}
+    </select>
+    <!-- 删除生产领料 -->
+    <delete id="delAskGoods">
+        delete from tld_invite where id = #{id}
+    </delete>
 </mapper>