问题修改

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

@@ -1,5 +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;
@@ -191,4 +192,14 @@ public class WarehousingController {
         warehousingService.getHalfExcel(notice, response);
     }
 
+    /**
+     * 其他入库
+     * @param askGoods 参数
+     * @return
+     */
+    @GetMapping("otherWarehousing")
+    public Map<String, Object> otherWarehousing(AskGoods askGoods){
+        return warehousingService.otherWarehousing(askGoods);
+    }
+
 }

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

@@ -109,4 +109,5 @@ public interface AskGoodsMapper {
     Map<String, Object> getDelAskGoods(String id);
 
     void delAskGoods(String id);
+
 }

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

@@ -110,4 +110,6 @@ public interface WarehousingMapper {
     void updateStorage(WarehousingVirtual warehousingVirtual1);
 
     int getNumUtil(String type);
+
+    void updateInventoryOther(Inventory inventory);
 }

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

@@ -1,5 +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;
@@ -45,4 +46,5 @@ public interface WarehousingService {
 
     Map<String, Object> delInventoryNotice(String id, HttpServletRequest request);
 
+    Map<String, Object> otherWarehousing(AskGoods askGoods);
 }

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

@@ -635,8 +635,8 @@ public class AskGoodsServiceImpl implements AskGoodsService {
             map.put("msg","200");
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("status", "500");
-            map.put("msg", "服务器请求异常，请稍后再试");
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }

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

@@ -281,8 +281,8 @@ public class InviteServiceImpl implements InviteService {
             map.put("msg","200");
         } catch (Exception e) {
             e.printStackTrace();
-            map.put("status", "500");
-            map.put("msg", "服务器请求异常，请稍后再试");
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
         }
         return map;
     }

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

@@ -785,8 +785,31 @@ public class WarehousingServiceImpl implements WarehousingService {
                     .setDocumentType("报工单");
             dictionaryMapper.addLogdata(logData);
             askGoodsMapper.delInventoryNotice(id);
-            map.put("status", "200");
-            map.put("msg", "成功");
+            map.put("msg", "200");
+        } catch (Exception e) {
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> otherWarehousing(AskGoods askGoods) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            //查询库存
+            List<Inventory> inventory = askGoodsMapper.getInventoryInfo(askGoods);
+            if(inventory.size() == 0){
+                //判断物料是否录入
+                MaterialClass materialClass = warehousingMapper.getMateriaIsExist(askGoods.getMaterialCode());
+                map.put("data", materialClass.getPartType());
+            } else {
+                warehousingMapper.updateInventoryOther(inventory.get(0));
+                List<WarehousingVirtual> list = new LinkedList<>();
+                warehousingMapper.addStorage(list);//入库流水
+            }
+            map.put("msg", "200");
         } catch (Exception e) {
             e.printStackTrace();
             map.put("status", "500");

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

@@ -33,7 +33,7 @@ public class WebPrintServiceImpl implements WebPrintService {
             tldPrint.setUserId(request.getHeader("userId"));
             tldPrint.setProducDate(DateUtil.dateConversion(tldPrint.getProducDate()));
             int count = webPrintMapper.getSerialCount(tldPrint);
-            String serial = generateSerial(count + "");
+            String serial = generateSerial((count + 1) + "");
             String num = generateNum(tldPrint.getNum());
             String materialCode = generateMaterialCode(tldPrint.getMaterialCode());
             String supplierCode = generateSupplierCode(tldPrint.getSupplierId());
@@ -59,7 +59,7 @@ public class WebPrintServiceImpl implements WebPrintService {
      * @return 供应商编号
      */
     public String generateSupplierCode(String code){
-        StringBuilder stringBuilder = new StringBuilder("1");
+        StringBuilder stringBuilder = new StringBuilder();
         for(int i = 0; i < 7 - code.length(); i++){
             stringBuilder.append("#");
         }
@@ -72,7 +72,7 @@ public class WebPrintServiceImpl implements WebPrintService {
      * @return 物料编号
      */
     public String generateMaterialCode(String code){
-        StringBuilder stringBuilder = new StringBuilder("1");
+        StringBuilder stringBuilder = new StringBuilder();
         for(int i = 0; i < 16 - code.length(); i++){
             stringBuilder.append("#");
         }
@@ -87,7 +87,7 @@ public class WebPrintServiceImpl implements WebPrintService {
      */
     public String generateSerial(String count){
         StringBuilder stringBuilder = new StringBuilder("1");
-        for(int i = 0; i < 6 - count.length(); i++){
+        for(int i = 0; i < 5 - count.length(); i++){
             stringBuilder.append("0");
         }
         stringBuilder.append(count);
@@ -99,7 +99,7 @@ public class WebPrintServiceImpl implements WebPrintService {
      * @return 数量
      */
     public String generateNum(String num){
-        StringBuilder stringBuilder = new StringBuilder("1");
+        StringBuilder stringBuilder = new StringBuilder();
         for(int i = 0; i < 6 - num.length(); i++){
             stringBuilder.append("#");
         }

src/main/resources/mapper/AskGoodsMapper.xml

@@ -579,6 +579,18 @@
         <if test="wbs == ''.toString() or wbs == null ">
             and wbs is null
         </if>
+        <if test="serial != '' and serial != null">
+            and serial = #{serial}
+        </if>
+        <if test="attribute != '' and attribute != null">
+            and attribute = #{attribute}
+        </if>
+        <if test="producBatch != '' and producBatch != null">
+            and produc_batch = #{producBatch}
+        </if>
+        <if test="supplierId != '' and supplierId != null">
+            and supplier_id = #{supplierId}
+        </if>
     </select>
     <!-- 查询仓库 -->
     <select id="getWarehouseWhere" resultType="String">

src/main/resources/mapper/WarehousingMapper.xml

@@ -664,4 +664,8 @@
     <select id="getNumUtil" resultType="int">
         select num from tld_util where type = #{type}
     </select>
+    <!-- 其他入库 -->
+    <update id="updateInventoryOther">
+        update tld_inventory set amount = amount + #{num} where id = #{id}
+    </update>
 </mapper>