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

@@ -88,4 +88,14 @@ public class GsAccessController {
     }
 
 
+    /**
+     * 非生产领料出库(要货申请单)
+     * @param mapList 参数
+     * @return 返回结果
+     */
+    @PostMapping("addAskGoodsNoProd")
+    @PassToken
+    public Map<String, Object> addAskGoodsNoProd(List<Map<String,Object>> mapList){
+        return askGoodsService.addAskGoods(mapList);
+    }
 }

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

@@ -9,6 +9,8 @@ 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/impl/AskGoodsServiceImpl.java

@@ -89,6 +89,60 @@ public class AskGoodsServiceImpl implements AskGoodsService {
         return map;
     }
 
+
+    @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) {
         Map<String, Object> map = new HashMap<>();