Merge branch 'master' of http://8.142.144.205:3000/tuya_admin/tld-consumer-9560

# Conflicts:
#	src/main/java/com/tld/service/impl/ReceiveGoodsSerivceImpl.java

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

@@ -7,6 +7,7 @@ import com.tld.model.Dictionary;
 import com.tld.model.ReceiveGoods;
 import com.tld.service.AskGoodsService;
 import com.tld.service.DictionaryService;
+import com.tld.service.InviteService;
 import com.tld.service.ReceiveGoodsSerivce;
 import com.tld.util.PassToken;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,9 @@ public class GsAccessController {
     //申请领料出库
     @Autowired
     private AskGoodsService askGoodsService;
+    //申请领料出库（非生产）
+    @Autowired
+    private InviteService inviteService;
 
     /**
      * 字典
@@ -83,7 +87,7 @@ public class GsAccessController {
      */
     @PostMapping("addAskGoods")
     @PassToken
-    public Map<String, Object> addAskGoods(List<Map<String,Object>> mapList){
+    public Map<String, Object> addAskGoods(@RequestBody List<Map<String,Object>> mapList){
         return askGoodsService.addAskGoods(mapList);
     }
 
@@ -95,7 +99,7 @@ public class GsAccessController {
      */
     @PostMapping("addAskGoodsNoProd")
     @PassToken
-    public Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList){
-        return askGoodsService.addAskGoods(mapList);
+    public Map<String, Object> addAskGoodsNoProd(@RequestBody List<Map<String,Object>> mapList){
+        return inviteService.addAskGoodsNoProd(mapList);
     }
 }

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

@@ -10,6 +10,23 @@ import java.util.Map;
 
 @Mapper
 public interface InviteMapper {
+
+    //---------------------------------------------------
+
+    int getAskGoods(AskGoods askGoods);
+
+    void updateAskGoodsNum(AskGoods askGoods);
+
+    int getAskGoodsf(AskGoods askGoods);
+
+    void addAskGoodsf(AskGoods askGoods);
+
+    void addAskGoods(AskGoods askGoods);
+
+    void addAskGoodsLog(AskGoods askGoods);
+
+    //---------------------------------------------------
+
     List<AskGoods> getAskGoodsfList(AskGoods askGoods);
 
     List<AskGoods> getAskGoodsMaterial(AskGoods askGoods);

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

@@ -9,8 +9,6 @@ import java.util.Map;
 public interface AskGoodsService {
     Map<String, Object> addAskGoods(List<Map<String,Object>> mapList);
 
-    Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList);
-
     Map<String, Object> getAskGoodsfList(AskGoods askGoods);
 
     Map<String, Object> getAskGoodsMaterial(AskGoods askGoods);

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

@@ -2,9 +2,13 @@ package com.tld.service;
 
 import com.tld.model.AskGoods;
 
+import java.util.List;
 import java.util.Map;
 
 public interface InviteService {
+
+    Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList);
+
     Map<String, Object> getAskGoodsfList(AskGoods askGoods);
 
     Map<String, Object> getAskGoodsMaterial(AskGoods askGoods);

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

@@ -49,7 +49,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     AskGoods ag = new AskGoods();
                    //父表
                     ag.setAskGoodsId(jsonMap.get("requestOrderId").toString());
-                    ag.setUniqueCode(jsonMap.get("requestOrderNo").toString());
+                    ag.setAskGoodsCode(jsonMap.get("requestOrderNo").toString());
                     ag.setCompanyNumber(jsonMap.get("companyNo").toString());
                     ag.setSqrq(jsonMap.get("requestDate").toString());//申请日期
                     ag.setDepartmentId(jsonMap.get("useDepartment").toString());
@@ -57,6 +57,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
                     ag.setMoveType(jsonMap.get("moveType").toString());
 
                    //子表
+                    ag.setType("0");
                     ag.setEntryNumber(element.get("entryNumber").toString());
                     ag.setProductionCode(element.get("prodOrderNo").toString());
                     ag.setMaterialId(element.get("materialId").toString());
@@ -90,58 +91,7 @@ public class AskGoodsServiceImpl implements AskGoodsService {
     }
 
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList) {
-        Map<String, Object> map = new HashMap<>();
-        try{
-            List<AskGoods> askGoodsList = new LinkedList<AskGoods>();
-
-            for(Map<String,Object> jsonMap:mapList) {
-                List<Map<String, Object>> list = (List) jsonMap.get("datalist");
-                for (Map<String, Object> element : list) {
-                    AskGoods ag = new AskGoods();
-                    //父表
-                    ag.setAskGoodsId(jsonMap.get("requestOrderId").toString());
-                    ag.setUniqueCode(jsonMap.get("requestOrderNo").toString());
-                    ag.setCompanyNumber(jsonMap.get("companyNo").toString());
-                    ag.setSqrq(jsonMap.get("requestDate").toString());//申请日期
-                    ag.setDepartmentId(jsonMap.get("useDepartment").toString());
-                    ag.setSourceType(jsonMap.get("sourceType").toString());
-                    ag.setMoveType(jsonMap.get("moveType").toString());
-
-                    //子表
-                    ag.setEntryNumber(element.get("entryNumber").toString());
-                    ag.setProductionCode(element.get("prodOrderNo").toString());
-                    ag.setMaterialId(element.get("materialId").toString());
-                    ag.setWbs(element.get("WBS").toString());
-                    ag.setMeasurementId(element.get("measUnitId").toString());
-                    ag.setNum(element.get("orderCount").toString());
 
-                    askGoodsList.add(ag);
-                }
-            }
-            for(AskGoods askGoods : askGoodsList) {
-                int count = askGoodsMapper.getAskGoods(askGoods);
-                if (count != 0) {
-                    askGoodsMapper.updateAskGoodsNum(askGoods);
-                } else {
-                    if (askGoodsMapper.getAskGoodsf(askGoods) == 0) {
-                        askGoodsMapper.addAskGoodsf(askGoods);
-                    }
-                    askGoodsMapper.addAskGoods(askGoods);
-                }
-                askGoodsMapper.addAskGoodsLog(askGoods);
-            }
-            map.put("status", "0000");
-            map.put("msg","成功");
-        }catch (Exception e){
-            e.printStackTrace();
-            map.put("status", "0009");
-            map.put("msg", "服务器请求异常，请稍后再试");
-        }
-        return map;
-    }
 
     @Override
     public Map<String, Object> getAskGoodsfList(AskGoods askGoods) {

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

@@ -9,6 +9,7 @@ import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -173,4 +174,59 @@ public class InviteServiceImpl implements InviteService {
         }
         return (stringBuilder.append(count + 1)).toString();
     }
+
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<AskGoods> askGoodsList = new LinkedList<AskGoods>();
+
+            for(Map<String,Object> jsonMap:mapList) {
+                List<Map<String, Object>> list = (List) jsonMap.get("datalist");
+                for (Map<String, Object> element : list) {
+                    AskGoods ag = new AskGoods();
+                    //父表
+                    ag.setAskGoodsId(jsonMap.get("requestOrderId").toString());
+                    ag.setUniqueCode(jsonMap.get("requestOrderNo").toString());
+                    ag.setCompanyNumber(jsonMap.get("companyNo").toString());
+                    ag.setSqrq(jsonMap.get("requestDate").toString());//申请日期
+                    ag.setDepartmentId(jsonMap.get("useDepartment").toString());
+                    ag.setSourceType(jsonMap.get("sourceType").toString());
+                    ag.setMoveType(jsonMap.get("moveType").toString());
+
+                    ag.setAskGoodsApplyType(jsonMap.get("requestOrderType").toString());
+                    //子表
+                    ag.setEntryNumber(element.get("entryNumber").toString());
+                    ag.setProductionCode(element.get("prodOrderNo").toString());
+                    ag.setMaterialId(element.get("materialId").toString());
+                    ag.setWbs(element.get("WBS").toString());
+                    ag.setMeasurementId(element.get("measUnitId").toString());
+                    ag.setNum(element.get("orderCount").toString());
+
+                    askGoodsList.add(ag);
+                }
+            }
+            for(AskGoods askGoods : askGoodsList) {
+                int count = inviteMapper.getAskGoods(askGoods);
+                if (count != 0) {
+                    inviteMapper.updateAskGoodsNum(askGoods);
+                } else {
+                    if (inviteMapper.getAskGoodsf(askGoods) == 0) {
+                        inviteMapper.addAskGoodsf(askGoods);
+                    }
+                    inviteMapper.addAskGoods(askGoods);
+                }
+                inviteMapper.addAskGoodsLog(askGoods);
+            }
+            map.put("status", "0000");
+            map.put("msg","成功");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("status", "0009");
+            map.put("msg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

src/main/resources/mapper/AskGoodsMapper.xml

@@ -10,18 +10,18 @@
     <update id="updateAskGoodsNum">
         update tld_ask_goods
         set
-        num = (select num from tld_ask_goods where ask_goods_id = #{askGoodsId} and material_id = #{materialId})
+        num =#{num}
         where ask_goods_id = #{askGoodsId} and material_id = #{materialId}
     </update>
     <!-- 新增要料申请单 -->
     <insert id="addAskGoods">
-        insert into tld_ask_goods(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{outNum})
+        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>
     <!-- 新增要料日志 -->
     <insert id="addAskGoodsLog">
         insert into tld_ask_goods_log(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_code,company_number,sqrq,department_id,source_type,move_type,ask_goods_type)
-        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{outNum},#{askGoodsCode},#{companyNumber},#{sqrq},#{departmentId},#{sourceType},#{moveType},#{askGoodsType})
+        values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{num},#{outNum},#{askGoodsCode},#{companyNumber},#{sqrq},#{departmentId},#{sourceType},#{moveType},#{askGoodsType})
     </insert>
     <!-- 查询次要货单是否存在 -->
     <select id="getAskGoodsf" resultType="int">
@@ -29,8 +29,8 @@
     </select>
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsf">
-        insert into tld_ask_goods_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type,ask_goods_apply_type)
-        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType},#{askGoodsApplyType})
+        insert into tld_ask_goods_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type)
+        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType})
     </insert>
     <!-- 查询生产领料单 -->
     <select id="getAskGoodsfList" resultType="com.tld.model.AskGoods">

src/main/resources/mapper/InviteMapper.xml

@@ -4,20 +4,25 @@
 <mapper namespace="com.tld.mapper.InviteMapper">
     <!-- 查询要货单id+物料id是否存在 -->
     <select id="getAskGoods" resultType="int">
-        select count(*) from tld_ask_goods where ask_goods_id = #{askGoodsId} and material_id = #{materialId}
+        select count(*) from tld_invite where ask_goods_id = #{askGoodsId} and material_id = #{materialId}
     </select>
     <!-- 修改要料申请单数量 -->
     <update id="updateAskGoodsNum">
         update tld_ask_goods
         set
-        num = (select num from tld_ask_goods where ask_goods_id = #{askGoodsId} and material_id = #{materialId})
+        num = (select num from tld_invite where ask_goods_id = #{askGoodsId} and material_id = #{materialId})
         where ask_goods_id = #{askGoodsId} and material_id = #{materialId}
     </update>
     <!-- 新增要料申请单 -->
     <insert id="addAskGoods">
-        insert into tld_ask_goods(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num)
+        insert into tld_invite(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num)
         values(#{askGoodsId},#{entryNumber},#{productionCode},#{materialId},#{wbs},#{measurementId},#{outNum})
     </insert>
+    <!-- 新增要料申请单父级 -->
+    <insert id="addAskGoodsf">
+        insert into tld_invite_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type,ask_goods_apply_type)
+        values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType},#{askGoodsApplyType})
+    </insert>
     <!-- 新增要料日志 -->
     <insert id="addAskGoodsLog">
         insert into tld_ask_goods_log(ask_goods_id,entry_number,production_code,material_id,wbs,measurement_id,num,out_num,ask_goods_code,company_number,sqrq,department_id,source_type,move_type,ask_goods_type)
@@ -25,11 +30,11 @@
     </insert>
     <!-- 查询次要货单是否存在 -->
     <select id="getAskGoodsf" resultType="int">
-        select count(*) from tld_ask_goods_f where ask_goods_id = #{askGoodsId} and ask_goods_code = #{askGoodsCode}
+        select count(*) from tld_invite_f where ask_goods_id = #{askGoodsId} and ask_goods_code = #{askGoodsCode}
     </select>
     <!-- 新增要料申请单父级 -->
     <insert id="addAskGoodsNumf">
-        insert into tld_ask_goods_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type)
+        insert into tld_invite_f(ask_goods_id,ask_goods_code,company_number,sqrq,department,source_type,move_type)
         values(#{askGoodsId},#{askGoodsCode},#{companyNumber},#{sqrq},#{department},#{sourceType},#{moveType})
     </insert>
     <!-- 查询生产领料单 -->