Merge remote-tracking branch 'origin/master'

src/main/java/com/yunfeiyun/agmp/fms/controller/WmsWarehouseController.java

@@ -66,6 +66,26 @@ public class WmsWarehouseController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 新增仓库
+     */
+    @PreAuthorize("@ss.hasPermi('wms:warehouse:add')")
+    @Log(title = "仓库", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@Valid @RequestBody WmsWarehouse wmsWarehouse) {
+        return toAjax(wmsWarehouseService.insertWmsWarehouse(wmsWarehouse));
+    }
+
+    /**
+     * 修改仓库
+     */
+    @PreAuthorize("@ss.hasPermi('wms:warehouse:edit')")
+    @Log(title = "仓库", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@Valid @RequestBody WmsWarehouse wmsWarehouse) {
+        return toAjax(wmsWarehouseService.updateWmsWarehouse(wmsWarehouse));
+    }
+
     @PreAuthorize("@ss.hasPermi('wms:warehouse:select:list')")
     @GetMapping("/select/list")
     public TableDataInfo selectList(WmsWarehouse wmsWarehouse) {
@@ -122,25 +142,7 @@ public class WmsWarehouseController extends BaseController
         return success(wmsWarehouse);
     }
 
-    /**
-     * 新增仓库
-     */
-    @PreAuthorize("@ss.hasPermi('wms:warehouse:add')")
-    @Log(title = "仓库", businessType = BusinessType.INSERT)
-    @PostMapping("/add")
-    public AjaxResult add(@Valid @RequestBody WmsWarehouse wmsWarehouse) {
-        return toAjax(wmsWarehouseService.insertWmsWarehouse(wmsWarehouse));
-    }
 
-    /**
-     * 修改仓库
-     */
-    @PreAuthorize("@ss.hasPermi('wms:warehouse:edit')")
-    @Log(title = "仓库", businessType = BusinessType.UPDATE)
-    @PutMapping("/edit")
-    public AjaxResult edit(@Valid @RequestBody WmsWarehouse wmsWarehouse) {
-        return toAjax(wmsWarehouseService.updateWmsWarehouse(wmsWarehouse));
-    }
 
     /**
      * 删除仓库

src/main/java/com/yunfeiyun/agmp/fms/mapper/FmsLandHouseMapper.java

@@ -64,4 +64,12 @@ public interface FmsLandHouseMapper
 
     public int deleteFmsLandHouseByWarehouseId(@Param("warehouseId") String warehouseId, @Param("tid") String tid);
 
+    /**
+     * 新增仓库基地关联
+     *
+     * @param fmsLandHouse 仓库基地关联
+     * @return 结果
+     */
+    public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList);
+
 }

src/main/java/com/yunfeiyun/agmp/fms/service/IFmsLandHouseService.java

@@ -60,4 +60,14 @@ public interface IFmsLandHouseService
      * @return 结果
      */
     public int deleteFmsLandHouseByLandhouseId(String landhouseId, String tid);
+
+    public int deleteFmsLandHouseByWarehouseId(String warehouseId, String tid);
+
+    /**
+     * 新增仓库基地关联
+     *
+     * @param
+     * @return 结果
+     */
+    public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList);
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsLandHouseServiceImpl.java

@@ -1,12 +1,13 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-
+import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsLandHouse;
 import com.yunfeiyun.agmp.fms.mapper.FmsLandHouseMapper;
 import com.yunfeiyun.agmp.fms.service.IFmsLandHouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 /**
  * 仓库基地关联Service业务层处理
  * 
@@ -49,7 +50,7 @@ public class FmsLandHouseServiceImpl implements IFmsLandHouseService
      */
     @Override
     public int insertFmsLandHouse(FmsLandHouse fmsLandHouse) {
-        fmsLandHouse.setTid(fmsLandHouse.getLandId());
+        fmsLandHouse.setTid(SecurityUtils.getTid());
         return fmsLandHouseMapper.insertFmsLandHouse(fmsLandHouse);
     }
 
@@ -85,4 +86,19 @@ public class FmsLandHouseServiceImpl implements IFmsLandHouseService
     public int deleteFmsLandHouseByLandhouseId(String landhouseId, String tid) {
         return fmsLandHouseMapper.deleteFmsLandHouseByLandhouseId(landhouseId,tid);
     }
+
+    @Override
+    public int deleteFmsLandHouseByWarehouseId(String warehouseId, String tid) {
+        return fmsLandHouseMapper.deleteFmsLandHouseByWarehouseId(warehouseId,tid);
+    }
+
+    /**
+     * 新增仓库基地关联
+     *
+     * @param landHouseList@return 结果
+     */
+    @Override
+    public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList) {
+        return fmsLandHouseMapper.insertBatchFmsLandHouse(landHouseList);
+    }
 }

src/main/java/com/yunfeiyun/agmp/fms/service/impl/WmsWarehouseServiceImpl.java

@@ -1,19 +1,21 @@
 package com.yunfeiyun.agmp.fms.service.impl;
 
-import java.util.List;
-
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.exception.BizException;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
-import com.yunfeiyun.agmp.common.utils.StringUtils;
 import com.yunfeiyun.agmp.fms.domain.FmsLandHouse;
 import com.yunfeiyun.agmp.fms.domain.WmsWarehouse;
 import com.yunfeiyun.agmp.fms.mapper.FmsLandHouseMapper;
 import com.yunfeiyun.agmp.fms.mapper.WmsWarehouseMapper;
+import com.yunfeiyun.agmp.fms.service.IFmsLandHouseService;
 import com.yunfeiyun.agmp.fms.service.IWmsWarehouseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 
 /**
@@ -30,6 +32,9 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
     @Autowired
     private FmsLandHouseMapper fmsLandHouseMapper;
 
+    @Autowired
+    private IFmsLandHouseService fmsLandHouseService;
+
     /**
      * 查询仓库
      *
@@ -62,23 +67,30 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
     @Transactional
     @Override
     public int insertWmsWarehouse(WmsWarehouse wmsWarehouse) {
+        String tid = SecurityUtils.getTid();
         wmsWarehouse.setWarehouseId(wmsWarehouse.getId());
         wmsWarehouse.setWarehouseCreator(SecurityUtils.getUserId());
         wmsWarehouse.setWarehouseCreatorname(SecurityUtils.getUsername());
         wmsWarehouse.setWarehouseCreateddate(DateUtils.getTime());
+        wmsWarehouse.setTid(tid);
         int i = wmsWarehouseMapper.insertWmsWarehouse(wmsWarehouse);
 
         //更新关联关系
         List<String> landIds = wmsWarehouse.getLandIds();
-        if (landIds != null &&landIds.size() > 0) {
+
+        if (landIds != null && !landIds.isEmpty()) {
+            List<FmsLandHouse> fmsLandHouseList = new ArrayList<>();
             for (String landId : landIds) {
                 FmsLandHouse fmsLandHouse = new FmsLandHouse();
                 fmsLandHouse.setLandhouseId(fmsLandHouse.getId());
                 fmsLandHouse.setLandId(landId);
                 fmsLandHouse.setWarehouseId(wmsWarehouse.getWarehouseId());
-                fmsLandHouseMapper.insertFmsLandHouse(fmsLandHouse);
+                fmsLandHouse.setTid(tid);
+                fmsLandHouseList.add(fmsLandHouse);
             }
+            fmsLandHouseService.insertBatchFmsLandHouse(fmsLandHouseList);
         }
+
         return i;
     }
 
@@ -90,23 +102,31 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
      */
     @Override
     public int updateWmsWarehouse(WmsWarehouse wmsWarehouse) {
-        if(StringUtils.isEmpty(wmsWarehouse.getWarehouseId()) || ObjectUtils.isEmpty(wmsWarehouseMapper.selectWmsWarehouseByWarehouseId(wmsWarehouse.getWarehouseId(),wmsWarehouse.getTid())))
-        {
-            return 0;
+        String tid = SecurityUtils.getTid();
+        String warehouseId = wmsWarehouse.getWarehouseId();
+
+        WmsWarehouse wmsWarehouseOld = selectWmsWarehouseByWarehouseId(warehouseId,tid);
+        if(wmsWarehouseOld == null){
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "仓库不存在");
         }
+
         int i = wmsWarehouseMapper.updateWmsWarehouse(wmsWarehouse);
 
         //更新关联关系
-        fmsLandHouseMapper.deleteFmsLandHouseByWarehouseId(wmsWarehouse.getWarehouseId(), wmsWarehouse.getTid());
+        fmsLandHouseService.deleteFmsLandHouseByWarehouseId(warehouseId, tid);
         List<String> landIds = wmsWarehouse.getLandIds();
-        if (landIds != null && landIds.size() > 0) {
+
+        if (landIds != null && !landIds.isEmpty()) {
+            List<FmsLandHouse> fmsLandHouseList = new ArrayList<>();
             for (String landId : landIds) {
                 FmsLandHouse fmsLandHouse = new FmsLandHouse();
                 fmsLandHouse.setLandhouseId(fmsLandHouse.getId());
                 fmsLandHouse.setLandId(landId);
                 fmsLandHouse.setWarehouseId(wmsWarehouse.getWarehouseId());
-                fmsLandHouseMapper.insertFmsLandHouse(fmsLandHouse);
+                fmsLandHouse.setTid(tid);
+                fmsLandHouseList.add(fmsLandHouse);
             }
+            fmsLandHouseService.insertBatchFmsLandHouse(fmsLandHouseList);
         }
         return i;
     }

src/main/resources/mapper/FmsLandHouseMapper.xml

@@ -31,16 +31,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="landhouseId != null">landhouseId,</if>
             <if test="landId != null">landId,</if>
             <if test="warehouseId != null">warehouseId,</if>
-            <if test="tid != null">tid,</if>
+            tid
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="landhouseId != null">#{landhouseId},</if>
             <if test="landId != null">#{landId},</if>
             <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="tid != null">#{tid},</if>
+            #{tid}
          </trim>
     </insert>
 
+    <insert id="insertBatchFmsLandHouse" parameterType="FmsLandHouse">
+        insert into FmsLandHouse (landhouseId, landId, warehouseId, tid)
+            values
+        <foreach collection="list" item="item" index="index" separator=",">
+                (#{item.landhouseId}, #{item.landId}, #{item.warehouseId}, #{item.tid})
+        </foreach>
+    </insert>
+
     <update id="updateFmsLandHouse" parameterType="FmsLandHouse">
         update FmsLandHouse
         <trim prefix="SET" suffixOverrides=",">
@@ -61,19 +69,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteFmsLandHouseByLandhouseIds" parameterType="String">
-        delete from FmsLandHouse where landhouseId in
+        delete from FmsLandHouse where tid = #{tid} and landhouseId in
         <foreach item="landhouseId" collection="array" open="(" separator="," close=")">
             #{landhouseId}
         </foreach>
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and tid = #{tid}
-        </if>
     </delete>
 
     <delete id="deleteFmsLandHouseByWarehouseId" parameterType="String">
-        delete from FmsLandHouse where warehouseId = #{warehouseId}
-        <if test="tid != null and tid !='' and tid != '-1'">
-            and tid = #{tid}
-        </if>
+        delete from FmsLandHouse where warehouseId = #{warehouseId} and tid = #{tid}
     </delete>
 </mapper>

src/main/resources/mapper/WmsWarehouseMapper.xml

@@ -55,9 +55,9 @@
 
     <select id="selectWmsWarehouseByWarehouseId" parameterType="String" resultType="WmsWarehouse">
         <include refid="selectWmsWarehouseVo"/>
-        where warehouseId = #{warehouseId}
-        <if test="tid != null and tid != '-1'">and tid = #{tid}</if>
+        where warehouseId = #{warehouseId} and tid = #{tid}
     </select>
+
     <select id="selectUserManagerWarehouseIds" resultType="java.lang.String">
         (
             SELECT warehouseId