问题修改

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

@@ -76,7 +76,7 @@ public class DeliveryController {
      * @param id 参数
      * @return 返回结果
      */
-    @PostMapping("delDelivery")
+    @DeleteMapping("delDelivery")
     public Map<String, Object> delDelivery(String id , HttpServletRequest request){
         return deliveryService.delDelivery(id,request);
     }

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

@@ -5,6 +5,7 @@ import com.tld.service.QueryListService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -149,5 +150,14 @@ public class QueryListController {
     public void getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer, HttpServletResponse response){
         queryListService.getWarehouseTransferExcel(warehouseTransfer, response);
     }
+
+    /**
+     * 查询删除/修改日志信息
+     * @param logData  日志信息
+     */
+    @GetMapping("getLogData")
+    public Map<String, Object> getLogData(LogData logData){
+        return queryListService.getLogData(logData);
+    }
 }
 

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

@@ -62,7 +62,7 @@ public class WarehouseTransferController {
      * @param id 参数
      * @return 返回结果
      */
-    @PostMapping("delWarehouseTransfer")
+    @DeleteMapping("delWarehouseTransfer")
     public Map<String, Object> delWarehouseTransfer(String id , HttpServletRequest request){
         return warehouseTransferService.delWarehouseTransfer(id,request);
     }

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

@@ -125,7 +125,7 @@ public class WarehousingController {
      * @param id 参数
      * @return 返回结果
      */
-    @PostMapping("delInventoryNotice")
+    @DeleteMapping("delInventoryNotice")
     public Map<String, Object> delInventoryNotice(String id , HttpServletRequest request){
         return warehousingService.delInventoryNotice(id,request);
     }

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

@@ -36,4 +36,6 @@ public interface QueryListMapper {
     List<WarehouseTransfer> getWarehouseTransfer(WarehouseTransfer warehouseTransfer);
 
     List<Map<String, Object>> getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer);
+
+    List<LogData> getLogData(LogData logData);
 }

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

@@ -18,6 +18,10 @@ public class LogData {
      * 用户id
      */
     private String userId;
+    /**
+     * 用户名称
+     */
+    private String userName;
     /**
      * 生成日期
      */
@@ -34,4 +38,20 @@ public class LogData {
      * 单据类型
      */
     private String documentType;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+    /**
+     * 页数
+     */
+    private int page;
+    /**
+     * 条数
+     */
+    private int limit;
 }

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

@@ -2,6 +2,7 @@ package com.tld.service;
 
 import com.tld.model.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
@@ -31,4 +32,7 @@ public interface QueryListService {
     Map<String, Object> getWarehouseTransfer(WarehouseTransfer warehouseTransfer);
 
     void getWarehouseTransferExcel(WarehouseTransfer warehouseTransfer, HttpServletResponse response);
+
+    Map<String, Object> getLogData(LogData logData);
+
 }

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

@@ -625,9 +625,9 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         try{
             String userId = request.getHeader("userId");
             Map<String, Object> mapVal = askGoodsMapper.getDelAskGoods(id);
-            if(Double.parseDouble(mapVal.get("type").toString()) > 0){
+            if(Double.parseDouble(mapVal.get("out_num").toString()) > 0){
                 map.put("msg", "500");
-                map.put("errMsg", "此单据已有要料信息！");
+                map.put("errMsg", "此单据已出库！");
                 return map;
             }
             LogData logData = new LogData()

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

@@ -226,6 +226,11 @@ public class DeliveryServiceImpl implements DeliveryService {
         try {
             String userId = request.getHeader("userId");
             Map<String, Object> mapVal = deliveryMapper.getDeliverys(id);
+            if(Double.parseDouble(mapVal.get("out_num").toString()) > 0){
+                map.put("msg", "500");
+                map.put("errMsg", "此单据已出库！");
+                return map;
+            }
             LogData logData = new LogData()
                     .setUserId(userId)
                     .setData(mapVal.toString())
@@ -233,12 +238,11 @@ public class DeliveryServiceImpl implements DeliveryService {
                     .setDocumentType("交货单");
             dictionaryMapper.addLogdata(logData);
             deliveryMapper.delDelivery(id);
-            map.put("status", "200");
-            map.put("msg", "成功");
+            map.put("msg", "200");
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("status", "500");
-            map.put("msg", "服务器请求异常，请稍后再试");
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }

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

@@ -271,9 +271,9 @@ public class InviteServiceImpl implements InviteService {
         try{
             String userId = request.getHeader("userId");
             Map<String, Object> mapVal = inviteMapper.getDelAskGoods(id);
-            if(Double.parseDouble(mapVal.get("type").toString()) > 0){
+            if(Double.parseDouble(mapVal.get("out_num").toString()) > 0){
                 map.put("msg", "500");
-                map.put("errMsg", "此单据已有要料信息！");
+                map.put("errMsg", "此单据已出库！");
                 return map;
             }
             LogData logData = new LogData()

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

@@ -9,6 +9,7 @@ import com.tld.service.QueryListService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -290,4 +291,20 @@ public class QueryListServiceImpl implements QueryListService {
             e.printStackTrace();
         }
     }
+
+    @Override
+    public Map<String, Object> getLogData(LogData logData) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            PageHelper.startPage(logData.getPage(), logData.getLimit());
+            PageInfo<LogData> list = new PageInfo<>(queryListMapper.getLogData(logData));
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

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

@@ -219,6 +219,11 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
         try {
             String userId = request.getHeader("userId");
             Map<String, Object> mapVal = warehouseTransferMapper.getWarehouseTransfers(id);
+            if(Double.parseDouble(mapVal.get("out_num").toString()) > 0){
+                map.put("msg", "500");
+                map.put("errMsg", "此单据已出库！");
+                return map;
+            }
             LogData logData = new LogData()
                     .setUserId(userId)
                     .setData(mapVal.toString())
@@ -226,12 +231,11 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                     .setDocumentType("移库单");
             dictionaryMapper.addLogdata(logData);
             warehouseTransferMapper.delWarehouseTransfer(id);
-            map.put("status", "200");
-            map.put("msg", "成功");
+            map.put("msg", "200");
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("status", "500");
-            map.put("msg", "服务器请求异常，请稍后再试");
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }

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

@@ -778,6 +778,11 @@ public class WarehousingServiceImpl implements WarehousingService {
         try {
             String userId = request.getHeader("userId");
             Map<String, Object> mapVal = askGoodsMapper.getInventoryNotice(id);
+            if (mapVal.get("type").toString().equals("1")){
+                map.put("msg", "500");
+                map.put("errMsg", "报工单已报工");
+                return map;
+            }
             LogData logData = new LogData()
                     .setUserId(userId)
                     .setData(mapVal.toString())

src/main/resources/mapper/AskGoodsMapper.xml

@@ -15,8 +15,8 @@
     </update>
     <!-- 新增要料申请单 -->
     <insert id="addAskGoods">
-        insert into tld_ask_goods(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,type)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{type})
+        insert into tld_ask_goods(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,type,out_num)
+        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{type},'0')
     </insert>
     <!-- 新增要料日志 -->
     <insert id="addAskGoodsLog">

src/main/resources/mapper/InviteMapper.xml

@@ -16,7 +16,7 @@
     <!-- 新增要料申请单 -->
     <insert id="addAskGoods">
         insert into tld_invite(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_type)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{outNum},#{askGoodsType})
+        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},'0',#{askGoodsType})
     </insert>
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsf">

src/main/resources/mapper/QueryListMappeer.xml

@@ -411,4 +411,33 @@
             </if>
         </trim>
     </select>
+    <!-- 查询日志信息 -->
+    <select id="getLogData" resultType="com.tld.model.LogData">
+        SELECT
+        a.id,
+        a.user_id,
+        a.scrq,
+        a.DATA,
+        a.type,
+        a.document_type,
+        b.user_name
+        FROM
+        tld_log_data a
+        LEFT JOIN tld_user b ON a.user_id = b.id
+        <trim prefix="WHERE" prefixOverrides="and |or">
+            <if test="documentType != null and documentType != ''">
+                and document_type = #{documentType}
+            </if>
+            <if test="data != null and data != ''">
+                and data like CONCAT(CONCAT('%', #{data}), '%')
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and scrq <![CDATA[>=]]> #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and scrq <![CDATA[<=]]> #{endTime}
+            </if>
+        </trim>
+    </select>
+
 </mapper>

src/main/resources/mapper/WarehouseTransferMapper.xml

@@ -26,7 +26,7 @@
         join tld_warehouse_transfer_f b on a.warehouse_transfer_id = b.warehouse_transfer_id
         join tld_material c on a.material_id = c.tld_id
         join tld_warehouse e on a.supply_warehouse_id = e.tld_id
-        join tld_warehouse f on a.ask_goods_warehouse_id = f.tld_id
+        join tld_warehouse f on b.ask_goods_warehouse_id = f.tld_id
         <trim prefix="WHERE" prefixOverrides="and |or">
             <if test="type != null and type != ''">
                 and a.type = #{type}