问题修改

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

@@ -1,9 +1,6 @@
 package com.tld.controller;
 
-import com.tld.model.AskGoods;
-import com.tld.model.Notice;
-import com.tld.model.Storage;
-import com.tld.model.WarehousingVirtual;
+import com.tld.model.*;
 import com.tld.service.WarehousingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -202,4 +199,12 @@ public class WarehousingController {
         return warehousingService.otherWarehousing(askGoods);
     }
 
+    /**
+     * 推荐库位后其他入库
+     */
+    @GetMapping("otherWarehou")
+    public Map<String, Object> otherWarehou(Inventory inventory){
+        return warehousingService.otherWarehou(inventory);
+    }
+
 }

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

@@ -112,4 +112,6 @@ public interface WarehousingMapper {
     int getNumUtil(String type);
 
     void updateInventoryOther(Inventory inventory);
+
+    void addReturnWarehousingOther(WarehousingVirtual warehousingVirtual);
 }

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

@@ -96,6 +96,18 @@ public class Inventory implements Serializable {
      * 出货仓库
      */
     private String warehouseWhere;
+    /**
+     * 申请部门id
+     */
+    private String departmentId;
+    /**
+     * 用户编号
+     */
+    private String userId;
+    /**
+     * 其他入库数量
+     */
+    private String num;
     /**
      * 页数
      */

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

@@ -1,9 +1,6 @@
 package com.tld.service;
 
-import com.tld.model.AskGoods;
-import com.tld.model.Notice;
-import com.tld.model.Storage;
-import com.tld.model.WarehousingVirtual;
+import com.tld.model.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -47,4 +44,6 @@ public interface WarehousingService {
     Map<String, Object> delInventoryNotice(String id, HttpServletRequest request);
 
     Map<String, Object> otherWarehousing(AskGoods askGoods);
+
+    Map<String, Object> otherWarehou(Inventory inventory);
 }

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

@@ -625,6 +625,11 @@ 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){
+                map.put("msg", "500");
+                map.put("errMsg", "此单据已有要料信息！");
+                return map;
+            }
             LogData logData = new LogData()
                     .setUserId(userId)
                     .setData(mapVal.toString())

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

@@ -800,16 +800,72 @@ public class WarehousingServiceImpl implements WarehousingService {
         try {
             //查询库存
             List<Inventory> inventory = askGoodsMapper.getInventoryInfo(askGoods);
+            //判断物料是否录入
+            MaterialClass materialClass = warehousingMapper.getMateriaIsExist(askGoods.getMaterialCode());
             if(inventory.size() == 0){
-                //判断物料是否录入
-                MaterialClass materialClass = warehousingMapper.getMateriaIsExist(askGoods.getMaterialCode());
                 map.put("data", materialClass.getPartType());
+                map.put("msg", "500");
+                return map;
             } else {
                 warehousingMapper.updateInventoryOther(inventory.get(0));
                 List<WarehousingVirtual> list = new LinkedList<>();
+                String storageCode = codeGenerateRk();
+                WarehousingVirtual warehousingVirtual = new WarehousingVirtual()
+                        .setStorageCode(storageCode)
+                        .setWllbCode(materialClass.getWllbCode())
+                        .setSuppId(inventory.get(0).getSupplierId())
+                        .setSerial(inventory.get(0).getSerial())
+                        .setProducDate(inventory.get(0).getProducDate())
+                        .setCapacity(askGoods.getNum())
+                        .setType("其他入库")
+                        .setUserId(askGoods.getUserId())
+                        .setDepartmentId(askGoods.getDepartmentId())
+                        .setStorageLocationCode(inventory.get(0).getStorageLocationCode())
+                        .setWbs(inventory.get(0).getWbs())
+                        .setAccountSleeve(inventory.get(0).getAccountSleeve())
+                        .setMaterialId(materialClass.getTldId());
+                list.add(warehousingVirtual);
                 warehousingMapper.addStorage(list);//入库流水
+                warehousingMapper.addReturnWarehousingOther(warehousingVirtual);//其他入库返回信息
+                map.put("data", storageCode);
             }
             map.put("msg", "200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> otherWarehou(Inventory inventory) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            //判断物料是否录入
+            MaterialClass materialClass = warehousingMapper.getMateriaIsExist(inventory.getWllbCode());
+            warehousingMapper.updateInventoryOther(inventory);
+            List<WarehousingVirtual> list = new LinkedList<>();
+            String storageCode = codeGenerateRk();
+            WarehousingVirtual warehousingVirtual = new WarehousingVirtual()
+                    .setStorageCode(storageCode)
+                    .setWllbCode(materialClass.getWllbCode())
+                    .setSuppId(inventory.getSupplierId())
+                    .setSerial(inventory.getSerial())
+                    .setProducDate(inventory.getProducDate())
+                    .setCapacity(inventory.getNum())
+                    .setType("其他入库")
+                    .setUserId(inventory.getUserId())
+                    .setDepartmentId(inventory.getDepartmentId())
+                    .setStorageLocationCode(inventory.getStorageLocationCode())
+                    .setWbs(inventory.getWbs())
+                    .setAccountSleeve(inventory.getAccountSleeve())
+                    .setMaterialId(materialClass.getTldId());
+            list.add(warehousingVirtual);
+            warehousingMapper.addStorage(list);//入库流水
+            warehousingMapper.addReturnWarehousingOther(warehousingVirtual);//其他入库返回信息
+            map.put("data", storageCode);
+            map.put("msg", "200");
         } catch (Exception e) {
             e.printStackTrace();
             map.put("status", "500");

src/main/resources/mapper/WarehousingMapper.xml

@@ -668,4 +668,9 @@
     <update id="updateInventoryOther">
         update tld_inventory set amount = amount + #{num} where id = #{id}
     </update>
+    <!-- 其他入库返回gs -->
+    <insert id="addReturnWarehousingOther">
+        insert into tld_return_gs_other_warehousing(storage_code,account_sleeve,storage_location_code,wbs,amount,material_id)
+        value(#{storageCode},#{accountSleeve},#{storageLocationCode},#{wbs},#{amount},#{materialId})
+    </insert>
 </mapper>