Browse Source

问题修改

zhs 2 years ago
parent
commit
7cc91bab34

+ 0 - 5
src/main/java/com/tld/controller/WarehousingController.java

@@ -20,11 +20,6 @@ public class WarehousingController {
     @Autowired
     private WarehousingService warehousingService;
 
-    @GetMapping("test")
-    public void test(){
-        warehousingService.test();
-    }
-
     /**
      * 推荐库位
      * @param wllbCode 物料编码

+ 0 - 8
src/main/java/com/tld/mapper/WarehousingMapper.java

@@ -117,13 +117,5 @@ public interface WarehousingMapper {
 
     void updateVitrualNum(Inventory inventory1);
 
-    List<Map<String, Object>> gettest();
-
-    int geetStorget(String name);
-
-    void addgeetStorget(Map<String, Object> map);
-
-    void updategeetStorget(Map<String, Object> map);
-
     void addInventoryOther(Inventory inventory);
 }

+ 0 - 2
src/main/java/com/tld/service/WarehousingService.java

@@ -46,6 +46,4 @@ public interface WarehousingService {
     Map<String, Object> otherWarehousing(AskGoods askGoods);
 
     Map<String, Object> otherWarehou(Inventory inventory, HttpServletRequest request);
-
-    void test();
 }

+ 2 - 2
src/main/java/com/tld/service/impl/WarehouseTransferServiceImpl.java

@@ -168,7 +168,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
             if(list.get(0).getStorageLocationCodeRk().indexOf("XNKW") > 0){
                 warehousingMapper.addInventory(warehousing);//库存
             }
-            map.put("data", askGoodsId);
+            map.put("data", warehouseTransferCode);
             map.put("msg", "200");
         }catch (Exception e){
             e.printStackTrace();
@@ -269,7 +269,7 @@ public class WarehouseTransferServiceImpl implements WarehouseTransferService {
                     .setAskGoodsWarehouseId(warehouseTransferF.getAskGoodsWarehouseId()) //要货仓库id
                     .setWarehouseTransferType(warehouseTransferF.getWarehouseTransferType()); //移库类型
             warehouseTransferMapper.addReturnGsWarehouseTransferF(warehouseTransfer1);//新增返回gs数据父表信息
-            map.put("data", askGoodsId);
+            map.put("data", warehouseTransferCode);
             map.put("msg", "200");
         } catch (Exception e){
             e.printStackTrace();

+ 0 - 15
src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -861,21 +861,6 @@ public class WarehousingServiceImpl implements WarehousingService {
         return map;
     }
 
-    @Override
-    public void test() {
-       List<Map<String, Object>> list =warehousingMapper.gettest();
-       for(Map<String, Object> map : list){
-            int count = warehousingMapper.geetStorget(map.get("name").toString());
-           MaterialClass materialClass = warehousingMapper.getMateriaIsExist(map.get("code").toString());
-            if(count == 0){
-                map.put("typeVal", materialClass.getWllbClass() + "/");
-                warehousingMapper.addgeetStorget(map);
-            } else {
-                warehousingMapper.updategeetStorget(map);
-            }
-       }
-    }
-
 
     /**
      * 入库单生成

+ 0 - 3
src/main/resources/mapper/AskGoodsMapper.xml

@@ -660,9 +660,6 @@
         <if test="wbs != '' and wbs != null">
             and wbs = #{wbs}
         </if>
-        <if test="wbs == ''.toString() or wbs == null ">
-            and wbs is null
-        </if>
         <if test="serial != '' and serial != null">
             and serial = #{serial}
         </if>

+ 0 - 18
src/main/resources/mapper/WarehousingMapper.xml

@@ -694,22 +694,4 @@
             tld_inventory(storage_location_code,wllb_class,library_type,material_id,amount,totime,amount_lock,account_sleeve,wbs,supplier_id,serial,wllb_code,produc_date,scrq,produc_batch,attribute)
             value(#{storageLocationCode},#{wllbClass},#{libraryType},#{materialId},#{amount},now(),'0',#{accountSleeve},#{wbs},#{supplierId},#{serial},#{wllbCode},#{producDate},now(),#{producDate},#{attribute})
     </insert>
-
-    <select id="gettest" resultType="java.util.Map">
-        select * from tld_test
-    </select>
-
-    <select id="geetStorget" resultType="int">
-        select count(*) from tld_storage_location where storage_location_code = #{name}
-    </select>
-
-    <insert id="addgeetStorget" parameterType="java.util.Map">
-        insert into
-            tld_storage_location(storage_location_code,storage_location_name,warehouse_where,storage_location_type)
-            value(#{name},#{name},'e7f6bff1-e6ab-49e7-9',#{typeVal})
-    </insert>
-
-    <update id="updategeetStorget">
-        update tld_storage_location set storage_location_type = CONCAT(storage_location_type, #{typeVal}) where storage_location_code = #{name}
-    </update>
 </mapper>