Merge remote-tracking branch 'origin/master'

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

@@ -21,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -42,6 +41,17 @@ public class WmsSupplierController extends BaseController
     private IFmsLandService fmsLandService;
 
     /**
+     * 供应商资质上传
+     */
+    @PreAuthorize("@ss.hasPermi('wms:supplier:upload')")
+    @Log(title = "供应商资质上传", businessType = BusinessType.UPDATE)
+    @PostMapping("/upload")
+    public AjaxResult upload(MultipartFile file) {
+        return success(wmsSupplierService.upload(file));
+    }
+
+
+    /**
      * 查询供应商列表
      */
     @PreAuthorize("@ss.hasPermi('wms:supplier:list')")
@@ -54,32 +64,6 @@ public class WmsSupplierController extends BaseController
     }
 
     /**
-     * 导出供应商列表
-     */
-    @PreAuthorize("@ss.hasPermi('wms:supplier:export')")
-    @Log(title = "供应商", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response,@RequestBody WmsSupplier wmsSupplier) {
-        List<WmsSupplier> list = wmsSupplierService.selectWmsSupplierList(wmsSupplier);
-        ExcelUtil<WmsSupplier> util = new ExcelUtil<WmsSupplier>(WmsSupplier.class);
-        util.exportExcel(response, list, "供应商数据");
-    }
-
-    @PreAuthorize("@ss.hasPermi('wms:supplier:info')")
-    @GetMapping(value = "/info")
-    public AjaxResult getInfo(@RequestParam("supplierId") String supplierId) {
-        List<SysRes> sysResList = resManager.queryRes(supplierId, ResConstants.BizType.SUPPLY.getKey());
-        WmsSupplier wmsSupplier = wmsSupplierService.selectWmsSupplierBySupplierId(supplierId, SecurityUtils.getTid());
-        if(!sysResList.isEmpty())
-        {
-            SysRes sysRes = sysResList.get(0);
-            wmsSupplier.setSupplierPreview(sysRes.getResUrl());
-            wmsSupplier.setSupplierQualificationResId(sysRes.getResId());
-        }
-        return success(wmsSupplier);
-    }
-
-    /**
      * 新增供应商
      */
     @PreAuthorize("@ss.hasPermi('wms:supplier:add')")
@@ -99,6 +83,20 @@ public class WmsSupplierController extends BaseController
         return toAjax(wmsSupplierService.updateWmsSupplier(wmsSupplierAddReqVo));
     }
 
+    @PreAuthorize("@ss.hasPermi('wms:supplier:info')")
+    @GetMapping(value = "/info")
+    public AjaxResult getInfo(@RequestParam("supplierId") String supplierId) {
+        List<SysRes> sysResList = resManager.queryRes(supplierId, ResConstants.BizType.SUPPLY.getKey());
+        WmsSupplier wmsSupplier = wmsSupplierService.selectWmsSupplierBySupplierId(supplierId, SecurityUtils.getTid());
+        if(!sysResList.isEmpty())
+        {
+            SysRes sysRes = sysResList.get(0);
+            wmsSupplier.setSupplierPreview(sysRes.getResUrl());
+            wmsSupplier.setSupplierQualificationResId(sysRes.getResId());
+        }
+        return success(wmsSupplier);
+    }
+
     /**
      * 删除供应商
      */
@@ -110,12 +108,16 @@ public class WmsSupplierController extends BaseController
     }
 
     /**
-     * 供应商资质上传
+     * 导出供应商列表
      */
-    @PreAuthorize("@ss.hasPermi('wms:supplier:upload')")
-    @Log(title = "供应商资质上传", businessType = BusinessType.UPDATE)
-    @PostMapping("/upload")
-    public AjaxResult upload(MultipartFile file) {
-        return success(wmsSupplierService.upload(file));
+    @PreAuthorize("@ss.hasPermi('wms:supplier:export')")
+    @Log(title = "供应商", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response,@RequestBody WmsSupplier wmsSupplier) {
+        List<WmsSupplier> list = wmsSupplierService.selectWmsSupplierList(wmsSupplier);
+        ExcelUtil<WmsSupplier> util = new ExcelUtil<WmsSupplier>(WmsSupplier.class);
+        util.exportExcel(response, list, "供应商数据");
     }
+
+
 }

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

@@ -16,6 +16,7 @@ import com.yunfeiyun.agmp.fms.service.IWmsWarehouseService;
 import com.yunfeiyun.agmp.fms.util.DataAuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -67,10 +68,32 @@ public class WmsWarehouseController extends BaseController
     }
 
     /**
+     * 获取仓库详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('wms:warehouse:query')")
+    @GetMapping(value = "/info")
+    public AjaxResult getInfo(@RequestParam("warehouseId") String warehouseId) {
+        String tid = SecurityUtils.getTid();
+        WmsWarehouse wmsWarehouse = wmsWarehouseService.selectWmsWarehouseByWarehouseId(warehouseId, tid);
+        FmsLandHouse fmsLandHouse = new FmsLandHouse();
+        fmsLandHouse.setWarehouseId(warehouseId);
+        fmsLandHouse.setTid(tid);
+
+        List<FmsLandHouse> fmsLandHouses = fmsLandHouseService.selectFmsLandHouseList(fmsLandHouse);
+        List<String> list = new ArrayList<>();
+        for (FmsLandHouse landHouse : fmsLandHouses) {
+            list.add(landHouse.getLandId());
+        }
+        wmsWarehouse.setLandIds(list);
+        return success(wmsWarehouse);
+    }
+
+    /**
      * 新增仓库
      */
     @PreAuthorize("@ss.hasPermi('wms:warehouse:add')")
     @Log(title = "仓库", businessType = BusinessType.INSERT)
+    @Transactional(rollbackFor = Exception.class)
     @PostMapping("/add")
     public AjaxResult add(@Valid @RequestBody WmsWarehouse wmsWarehouse) {
         return toAjax(wmsWarehouseService.insertWmsWarehouse(wmsWarehouse));
@@ -81,11 +104,25 @@ public class WmsWarehouseController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('wms:warehouse:edit')")
     @Log(title = "仓库", businessType = BusinessType.UPDATE)
+    @Transactional(rollbackFor = Exception.class)
     @PutMapping("/edit")
     public AjaxResult edit(@Valid @RequestBody WmsWarehouse wmsWarehouse) {
         return toAjax(wmsWarehouseService.updateWmsWarehouse(wmsWarehouse));
     }
 
+
+    /**
+     * 删除仓库
+     */
+    @PreAuthorize("@ss.hasPermi('wms:warehouse:delete')")
+    @Log(title = "仓库", businessType = BusinessType.DELETE)
+    @Transactional(rollbackFor = Exception.class)
+    @DeleteMapping("/delete")
+    public AjaxResult delete(@RequestParam("warehouseIds") String[] warehouseIds) {
+        return toAjax(wmsWarehouseService.deleteWmsWarehouseByWarehouseIds(warehouseIds, SecurityUtils.getTid()));
+    }
+
+
     @PreAuthorize("@ss.hasPermi('wms:warehouse:select:list')")
     @GetMapping("/select/list")
     public TableDataInfo selectList(WmsWarehouse wmsWarehouse) {
@@ -124,33 +161,4 @@ public class WmsWarehouseController extends BaseController
         util.exportExcel(response, list, "仓库数据");
     }
 
-    /**
-     * 获取仓库详细信息
-     */
-    @PreAuthorize("@ss.hasPermi('wms:warehouse:query')")
-    @GetMapping(value = "/info")
-    public AjaxResult getInfo(@RequestParam("warehouseId") String warehouseId) {
-        WmsWarehouse wmsWarehouse = wmsWarehouseService.selectWmsWarehouseByWarehouseId(warehouseId, SecurityUtils.getTid());
-        FmsLandHouse fmsLandHouse = new FmsLandHouse();
-        fmsLandHouse.setWarehouseId(warehouseId);
-        List<FmsLandHouse> fmsLandHouses = fmsLandHouseService.selectFmsLandHouseList(fmsLandHouse);
-        List<String> list = new ArrayList<>();
-        for (FmsLandHouse landHouse : fmsLandHouses) {
-            list.add(landHouse.getLandId());
-        }
-        wmsWarehouse.setLandIds(list);
-        return success(wmsWarehouse);
-    }
-
-
-
-    /**
-     * 删除仓库
-     */
-    @PreAuthorize("@ss.hasPermi('wms:warehouse:delete')")
-    @Log(title = "仓库", businessType = BusinessType.DELETE)
-    @DeleteMapping("/delete")
-    public AjaxResult delete(@RequestParam("warehouseIds") String[] warehouseIds) {
-        return toAjax(wmsWarehouseService.deleteWmsWarehouseByWarehouseIds(warehouseIds, SecurityUtils.getTid()));
-    }
 }

src/main/java/com/yunfeiyun/agmp/fms/domain/WmsSupplier.java

@@ -2,11 +2,7 @@ package com.yunfeiyun.agmp.fms.domain;
 
 import com.yunfeiyun.agmp.common.annotation.Excel;
 import com.yunfeiyun.agmp.common.core.domain.BaseEntity;
-import com.yunfeiyun.agmp.common.enums.DictTypeEnums;
-import com.yunfeiyun.agmp.common.utils.DictUtils;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 供应商对象 WmsSupplier

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

@@ -72,4 +72,8 @@ public interface FmsLandHouseMapper
      */
     public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList);
 
+    public List<FmsLandHouse> selectFmsLandHouseByWarehouseId(@Param("warehouseIds") String[] warehouseIds, @Param("tid") String tid);
+
+    public int deleteBatchFmsLandHouseByWarehouseIds(@Param("warehouseIds") String[] warehouseIds, @Param("tid") String tid);
+
 }

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

@@ -70,4 +70,8 @@ public interface IFmsLandHouseService
      * @return 结果
      */
     public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList);
+
+    public List<FmsLandHouse> selectFmsLandHouseByWarehouseId(String[] warehouseIds, String tid);
+
+    public int deleteBatchFmsLandHouseByWarehouseIds(String[] warehouseIds, String tid);
 }

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

@@ -101,4 +101,14 @@ public class FmsLandHouseServiceImpl implements IFmsLandHouseService
     public int insertBatchFmsLandHouse(List<FmsLandHouse> landHouseList) {
         return fmsLandHouseMapper.insertBatchFmsLandHouse(landHouseList);
     }
+
+    @Override
+    public List<FmsLandHouse> selectFmsLandHouseByWarehouseId(String[] warehouseIds, String tid) {
+        return fmsLandHouseMapper.selectFmsLandHouseByWarehouseId(warehouseIds,tid);
+    }
+
+    @Override
+    public int deleteBatchFmsLandHouseByWarehouseIds(String[] warehouseIds, String tid) {
+        return fmsLandHouseMapper.deleteBatchFmsLandHouseByWarehouseIds(warehouseIds,tid);
+    }
 }

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

@@ -86,6 +86,7 @@ public class WmsSupplierServiceImpl implements IWmsSupplierService
             wmsSupplierAddReqVo.setSupplierId(wmsSupplierAddReqVo.getId());
         }
         resManager.updateRes(wmsSupplierAddReqVo.getSupplierQualificationResId(),wmsSupplierAddReqVo.getSupplierId());
+        wmsSupplierAddReqVo.setTid(SecurityUtils.getTid());
         return wmsSupplierMapper.insertWmsSupplier(wmsSupplierAddReqVo);
     }
 
@@ -98,6 +99,7 @@ public class WmsSupplierServiceImpl implements IWmsSupplierService
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int updateWmsSupplier(WmsSupplierAddReqVo  wmsSupplierAddReqVo) {
+        wmsSupplierAddReqVo.setTid(SecurityUtils.getTid());
         List<SysRes> oldRes = resManager.queryRes(wmsSupplierAddReqVo.getSupplierId(),ResConstants.BizType.SUPPLY,ResConstants.mediaType.IMG);
         if(oldRes.isEmpty()){
             if (!StringUtils.isEmpty(wmsSupplierAddReqVo.getSupplierQualificationResId())) {

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

@@ -139,7 +139,16 @@ public class WmsWarehouseServiceImpl implements IWmsWarehouseService
      */
     @Override
     public int deleteWmsWarehouseByWarehouseIds(String[] warehouseIds, String tid) {
-        return wmsWarehouseMapper.deleteWmsWarehouseByWarehouseIds(warehouseIds,tid);
+        //更新关联关系
+        List<FmsLandHouse> fmsLandHouseList = fmsLandHouseService.selectFmsLandHouseByWarehouseId(warehouseIds, tid);
+        if(fmsLandHouseList != null && !fmsLandHouseList.isEmpty()){
+            throw new BizException(ErrorCode.INVALID_PARAMETER.getCode(), "仓库已绑定基地，请先解绑后再删除");
+        }
+        int status = wmsWarehouseMapper.deleteWmsWarehouseByWarehouseIds(warehouseIds,tid);
+        if(status != 0){
+            fmsLandHouseService.deleteBatchFmsLandHouseByWarehouseIds(warehouseIds, tid);
+        }
+        return status;
     }
 
     /**

src/main/resources/mapper/FmsLandHouseMapper.xml

@@ -24,7 +24,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and tid = #{tid}
         </if>
     </select>
-        
+
+    <select id="selectFmsLandHouseByWarehouseId" parameterType="String" resultType="FmsLandHouse">
+        <include refid="selectFmsLandHouseVo"/>
+        where tid = #{tid} and warehouseId in
+        <foreach item="warehouseId" collection="warehouseIds" open="(" separator="," close=")">
+            #{warehouseId}
+        </foreach>
+    </select>
+
     <insert id="insertFmsLandHouse" parameterType="FmsLandHouse">
         insert into FmsLandHouse
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -78,4 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <delete id="deleteFmsLandHouseByWarehouseId" parameterType="String">
         delete from FmsLandHouse where warehouseId = #{warehouseId} and tid = #{tid}
     </delete>
+
+    <delete id="deleteBatchFmsLandHouseByWarehouseIds" parameterType="String">
+        delete from FmsLandHouse where tid = #{tid} and warehouseId in
+        <foreach item="warehouseId" collection="warehouseIds" open="(" separator="," close=")">
+            #{warehouseId}
+        </foreach>
+    </delete>
 </mapper>

src/main/resources/mapper/WmsSupplierMapper.xml

@@ -9,9 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectWmsSupplierList" parameterType="WmsSupplier" resultType="WmsSupplier">
-        select supplierId, supplierName, supplierLinkman, supplierLinktel, supplierLinkaddress, supplierRemark, supplierCreator, supplierCreateddate,supplierType, b.resUrl as supplierPreview, b.resId as supplierQualificationResId, cusareaId, a.tid from WmsSupplier a
-        LEFT JOIN SysRes b on b.resBusId = a.supplierId
-        <where>  
+        select supplierId, supplierName, supplierLinkman, supplierLinktel, supplierLinkaddress, supplierRemark,
+            supplierCreator, supplierCreateddate,supplierType, b.resUrl as supplierPreview,
+            b.resId as supplierQualificationResId, cusareaId, a.tid
+        from WmsSupplier a
+            LEFT JOIN SysRes b on b.resBusId = a.supplierId
+        <where>
+            a.tid = #{tid}
             <if test="supplierName != null  and supplierName != ''"> and supplierName like concat('%', #{supplierName}, '%')</if>
             <if test="supplierLinkman != null  and supplierLinkman != ''"> and supplierLinkman = #{supplierLinkman}</if>
             <if test="supplierLinktel != null  and supplierLinktel != ''"> and supplierLinktel = #{supplierLinktel}</if>
@@ -21,15 +25,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="supplierCreateddate != null  and supplierCreateddate != ''"> and supplierCreateddate = #{supplierCreateddate}</if>
             <if test="supplierType != null  and supplierType != ''"> and supplierType = #{supplierType}</if>
             <if test="cusareaId != null and cusareaId != ''">and cusareaId = #{cusareaId}</if>
-            <if test="tid != null and tid !='' and tid != '-1'">and a.tid = #{tid}</if>
         </where>
     </select>
     
     <select id="selectWmsSupplierBySupplierId" parameterType="String" resultType="WmsSupplier">
         <include refid="selectWmsSupplierVo"/>
-        where
-        supplierId = #{supplierId}
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
+        where supplierId = #{supplierId} and tid = #{tid}
     </select>
         
     <insert id="insertWmsSupplier" parameterType="WmsSupplier">
@@ -77,8 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="tid != null">tid = #{tid},</if>
         </trim>
         where
-        supplierId = #{supplierId}
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
+        supplierId = #{supplierId} and tid = #{tid}
     </update>
 
     <delete id="deleteWmsSupplierBySupplierId" parameterType="String">
@@ -87,10 +87,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteWmsSupplierBySupplierIds" parameterType="String">
-        delete from WmsSupplier where supplierId in 
+        delete from WmsSupplier where tid = #{tid} and supplierId in
         <foreach item="supplierId" collection="array" open="(" separator="," close=")">
             #{supplierId}
         </foreach>
-        <if test="tid != null and tid !='' and tid != '-1'">and tid = #{tid}</if>
     </delete>
 </mapper>

src/main/resources/mapper/WmsWarehouseMapper.xml

@@ -127,10 +127,9 @@
     </delete>
 
     <delete id="deleteWmsWarehouseByWarehouseIds" parameterType="String">
-        delete from WmsWarehouse where warehouseId in
+        delete from WmsWarehouse where tid = #{tid} and warehouseId in
         <foreach item="warehouseId" collection="array" open="(" separator="," close=")">
             #{warehouseId}
         </foreach>
-        <if test="tid != null and tid != '-1'">and tid = #{tid}</if>
     </delete>
 </mapper>