Explorar el Código

修改接入接口

songwenhao hace 2 años
padre
commit
207a34dae0

+ 4 - 3
src/main/java/com/tld/controller/GsAccessController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,13 +34,13 @@ public class GsAccessController {
 
     /**
      * 字典
-     * @param dictionary 参数
+     * @param dictionarys 参数
      * @return 返回结果
      */
     @PostMapping("addDictionary")
     @PassToken
-    public Map<String, Object> addDictionary(Dictionary dictionary){
-        return dictionaryService.addDictionary(dictionary);
+    public Map<String, Object> addDictionary(List<Dictionary> dictionarys){
+        return dictionaryService.addDictionary(dictionarys);
     }
 
     /**

+ 3 - 1
src/main/java/com/tld/service/DictionaryService.java

@@ -1,10 +1,12 @@
 package com.tld.service;
 
 import com.tld.model.Dictionary;
+
+import java.util.List;
 import java.util.Map;
 
 public interface DictionaryService {
-    Map<String, Object> addDictionary(Dictionary dictionary);
+    Map<String, Object> addDictionary(List<Dictionary> dictionarys);
 
     Map<String, Object> getDictionary(Dictionary dictionary);
 

+ 17 - 14
src/main/java/com/tld/service/impl/DictionaryServiceImpl.java

@@ -23,22 +23,25 @@ public class DictionaryServiceImpl implements DictionaryService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> addDictionary(Dictionary dictionary) {
+    public Map<String, Object> addDictionary(List<Dictionary> dictionarys) {
+
         Map<String, Object> map = new HashMap<>();
         try{
-            String tableName = dictionaryMapper.getTableName(dictionary.getType());
-            if("null".equals(tableName)){
-                map.put("msg", "500");
-                map.put("errMsg", "失败,请联系是否存在此字典");
-                return map;
-            }
-            dictionary.setTableName(tableName);
-            if(dictionary.getType().equals("物料字典")){
-                dictionaryMapper.addMaterial(dictionary);
-            } else if(dictionary.getType().equals("库账对存")){
-                dictionaryMapper.addTreasuryAccount(dictionary);
-            } else {
-                dictionaryMapper.addDictionary(dictionary);
+            for(Dictionary dictionary : dictionarys) {
+                String tableName = dictionaryMapper.getTableName(dictionary.getType());
+                if ("null".equals(tableName)) {
+                    map.put("msg", "500");
+                    map.put("errMsg", "失败,请联系是否存在此字典");
+                    return map;
+                }
+                dictionary.setTableName(tableName);
+                if (dictionary.getType().equals("物料字典")) {
+                    dictionaryMapper.addMaterial(dictionary);
+                } else if (dictionary.getType().equals("库账对存")) {
+                    dictionaryMapper.addTreasuryAccount(dictionary);
+                } else {
+                    dictionaryMapper.addDictionary(dictionary);
+                }
             }
             map.put("msg", "200");
         }  catch (Exception e){

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

@@ -57,6 +57,7 @@ public class ReceiveGoodsSerivceImpl implements ReceiveGoodsSerivce {
     public Map<String, Object> addReceiveGoods(ReceiveGoods receiveGoods) {
         Map<String, Object> map = new HashMap<>();
         try{
+
             receiveGoods.setType("0");
             //存在一个采购单发送多次的情况  如果是一个采购单多次传输 则改变原数据的数量
             ReceiveGoods receiveGoods1 = new ReceiveGoods().setOrderCode(receiveGoods.getOrderCode()).setMaterialId(receiveGoods.getMaterialId());