소스 검색

问题修改

zhs 2 년 전
부모
커밋
3799c93d01

+ 13 - 3
src/main/java/com/tld/controller/ReceiveGoodsController.java

@@ -3,9 +3,9 @@ package com.tld.controller;
 import com.tld.model.ReceiveGoods;
 import com.tld.service.ReceiveGoodsSerivce;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
 /**
@@ -58,4 +58,14 @@ public class ReceiveGoodsController {
         return receiveGoodsSerivce.timeoutPurchase(receiveGoods);
     }
 
+    /**
+     * 删除采购单
+     * @param id 参数
+     * @return 返回结果
+     */
+    @PutMapping("delReceiveGoods")
+    public Map<String, Object> delReceiveGoods(String id, HttpServletRequest request){
+        return receiveGoodsSerivce.delReceiveGoods(id, request);
+    }
+
 }

+ 3 - 4
src/main/java/com/tld/mapper/DictionaryMapper.java

@@ -1,9 +1,6 @@
 package com.tld.mapper;
 
-import com.tld.model.Access;
-import com.tld.model.Delivery;
-import com.tld.model.Dictionary;
-import com.tld.model.WarehouseTransfer;
+import com.tld.model.*;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -40,4 +37,6 @@ public interface DictionaryMapper {
     void deleteDictionary(Dictionary dictionary);
 
     void addAccess(Access access);
+
+    void addLogdata(LogData logData);
 }

+ 4 - 0
src/main/java/com/tld/mapper/ReceiveGoodsMapper.java

@@ -29,4 +29,8 @@ public interface ReceiveGoodsMapper {
     List<ReceiveGoods> getPurchase(ReceiveGoods receiveGoods);
 
     List<ReceiveGoods> timeoutPurchase(ReceiveGoods receiveGoods);
+
+    Map<String, Object> getDelReceiveGoods(String id);
+
+    void delReceiveGoods(String id);
 }

+ 37 - 0
src/main/java/com/tld/model/LogData.java

@@ -0,0 +1,37 @@
+package com.tld.model;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 数据操作日志
+ */
+@Data
+@Accessors(chain = true)
+@SuppressWarnings("serial")
+public class LogData {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 生成日期
+     */
+    private String scrq;
+    /**
+     * 数据
+     */
+    private String data;
+    /**
+     * 删除0修改1
+     */
+    private String type;
+    /**
+     * 单据类型
+     */
+    private String documentType;
+}

+ 3 - 0
src/main/java/com/tld/service/ReceiveGoodsSerivce.java

@@ -4,6 +4,7 @@ package com.tld.service;
 import com.alibaba.fastjson.JSONArray;
 import com.tld.model.ReceiveGoods;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 
@@ -21,4 +22,6 @@ public interface ReceiveGoodsSerivce {
     Map<String, Object> getPurchase(ReceiveGoods receiveGoods);
 
     Map<String, Object> timeoutPurchase(ReceiveGoods receiveGoods);
+
+    Map<String, Object> delReceiveGoods(String param, HttpServletRequest request);
 }

+ 26 - 0
src/main/java/com/tld/service/impl/ReceiveGoodsSerivceImpl.java

@@ -6,12 +6,14 @@ import com.github.pagehelper.PageInfo;
 import com.tld.mapper.DictionaryMapper;
 import com.tld.mapper.ReceiveGoodsMapper;
 import com.tld.model.Access;
+import com.tld.model.LogData;
 import com.tld.model.ReceiveGoods;
 import com.tld.service.ReceiveGoodsSerivce;
 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.util.*;
 
 @Service
@@ -141,6 +143,7 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Map<String, Object> addPurchase(List<Map<String, Object>> jsonData) {
         Map<String, Object> map = new HashMap<>();
         try{
@@ -189,4 +192,27 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
         }
         return map;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> delReceiveGoods(String id, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            String userId = request.getHeader("userId");
+            Map<String, Object> mapVal = receiveGoodsMapper.getDelReceiveGoods(id);
+            LogData logData = new LogData()
+                    .setUserId(userId)
+                    .setData(mapVal.toString())
+                    .setType("0")
+                    .setDocumentType("单据类型");
+            dictionaryMapper.addLogdata(logData);
+            receiveGoodsMapper.delReceiveGoods(id);
+            map.put("msg","200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("status", "500");
+            map.put("msg", "服务器请求异常,请稍后再试");
+        }
+        return map;
+    }
 }

+ 4 - 0
src/main/resources/mapper/DictionaryMapper.xml

@@ -186,4 +186,8 @@
     <insert id="addAccess">
         insert into tld_access(type,data,scrq) value(#{type},#{data},now())
     </insert>
+    <!-- 新增操作日志 -->
+    <insert id="addLogdata">
+        insert into tld_log_data(user_id,scrq,data,type,document_type) value(#{userId},now(),#{data},#{type},#{documentType})
+    </insert>
 </mapper>

+ 8 - 0
src/main/resources/mapper/ReceiveGoodsMapper.xml

@@ -194,4 +194,12 @@
             and a.arrival_time <![CDATA[<=]]> #{endTime}
         </if>
     </select>
+    <!-- 查询 原始记录 -->
+    <select id="getDelReceiveGoods" resultType="java.util.Map">
+        select * from tld_receive_goods where id = #{id}
+    </select>
+    <!-- 删除原始记录 -->
+    <delete id="delReceiveGoods">
+        delete from tld_receive_goods where id = #{id}
+    </delete>
 </mapper>