Merge remote-tracking branch 'origin/dev' into dev

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shipping/controller/TVoyageController.java

@@ -40,7 +40,7 @@ public class TVoyageController extends BaseController
     /**
      * 查询航次列表
      */
-    @PreAuthorize("@ss.hasPermi('shipping:voyage:list')")
+    //@PreAuthorize("@ss.hasPermi('shipping:voyage:list')")
     @GetMapping("/list")
     public TableDataInfo list(TVoyage tVoyage)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/quotation/TSeapriceController.java

@@ -119,6 +119,14 @@ public class TSeapriceController extends BaseController
         if (StringUtils.isNull(tSeaprice.getfQty())) {
             return AjaxResult.error("请维护箱量");
         }
+
+        //TODO
+        /**
+         * 20210708 dongyongwei
+         * 新增查询主表ID的逻辑,如果存在,赋值条件给合计金额
+         * 如果查询不到主表ID,提醒:没有找到符合条件的运价
+         */
+
         return tSeapriceService.calculateOceanFreight(tSeaprice);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warehouse/warehouseBusiness/TWarehouseWarehousecheckController.java

@@ -2,20 +2,18 @@ package com.ruoyi.web.controller.warehouse.warehouseBusiness;
 
 import java.util.List;
 
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckService;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckitemsService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -71,7 +69,7 @@ public class TWarehouseWarehousecheckController extends BaseController
     @GetMapping(value = "/{fId}")
     public AjaxResult getInfo(@PathVariable("fId") Long fId)
     {
-        return AjaxResult.success(tWarehouseWarehousecheckService.selectTWarehouseWarehousecheckById(fId));
+        return tWarehouseWarehousecheckService.selectTWarehouseWarehousecheckById(fId);
     }
 
     /**
@@ -80,9 +78,17 @@ public class TWarehouseWarehousecheckController extends BaseController
     @PreAuthorize("@ss.hasPermi('warehouseBusiness:warehouseCheck:add')")
     @Log(title = "巡检主", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TWarehouseWarehousecheck tWarehouseWarehousecheck)
+    public AjaxResult add(@RequestParam("tWarehouseWarehousecheck") String tWarehouseWareHouseCheck,
+                          @RequestParam("TWarehouseWarehousecheckitems") String TWarehouseWareHouseCheckItems)
     {
-        return toAjax(tWarehouseWarehousecheckService.insertTWarehouseWarehousecheck(tWarehouseWarehousecheck));
+        if (StringUtils.isNull(tWarehouseWareHouseCheck) || "{}".equals(tWarehouseWareHouseCheck)){
+            return AjaxResult.error("巡检主表信息不能为空");
+        }
+        if (StringUtils.isNull(TWarehouseWareHouseCheckItems) || "[]".equals(TWarehouseWareHouseCheckItems)){
+            return AjaxResult.error("巡检从表信息不能为空");
+        }
+        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
+        return tWarehouseWarehousecheckService.tWarehouseWareHouseCheckInsert(tWarehouseWareHouseCheck,TWarehouseWareHouseCheckItems,loginUser);
     }
 
     /**
@@ -104,15 +110,6 @@ public class TWarehouseWarehousecheckController extends BaseController
 	@DeleteMapping("/{fIds}")
     public AjaxResult remove(@PathVariable Long[] fIds)
     {
-        Integer father=tWarehouseWarehousecheckService.deleteTWarehouseWarehousecheckByIds(fIds);
-
-        Integer child=itWarehouseWarehousecheckitemsService.deleteTWarehouseWarehousecheckitemsByIds(fIds);
-        if(father<=0||child<=0){
-            return toAjax(0);
-        }
-        else{
-            return toAjax(father);
-        }
-
+        return tWarehouseWarehousecheckService.deleteTWarehouseWarehousecheckByIds(fIds);
     }
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseWarehousecheckMapper.java

@@ -60,4 +60,11 @@ public interface TWarehouseWarehousecheckMapper
      * @return 结果
      */
     public int deleteTWarehouseWarehousecheckByIds(Long[] fIds);
+
+    /**
+     * 批量更新数据状态
+     * @param fIds
+     * @return
+     */
+    public int updateTWarehouseWarehousecheckById(Long[] fIds);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/mapper/TWarehouseWarehousecheckitemsMapper.java

@@ -59,4 +59,11 @@ public interface TWarehouseWarehousecheckitemsMapper
      * @return 结果
      */
     public int deleteTWarehouseWarehousecheckitemsByIds(Long[] fIds);
+
+    /**
+     * 批量更新数据状态
+     * @param fIds
+     * @return
+     */
+    public int updateTWarehouseWarehousecheckitemsById(Long[] fIds);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/ITWarehouseWarehousecheckService.java

@@ -1,5 +1,7 @@
 package com.ruoyi.warehouseBusiness.service;
 
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
 
 import java.util.List;
@@ -18,7 +20,7 @@ public interface ITWarehouseWarehousecheckService
      * @param fId 巡检主ID
      * @return 巡检主
      */
-    public TWarehouseWarehousecheck selectTWarehouseWarehousecheckById(Long fId);
+    public AjaxResult selectTWarehouseWarehousecheckById(Long fId);
 
 
 
@@ -52,7 +54,7 @@ public interface ITWarehouseWarehousecheckService
      * @param fIds 需要删除的巡检主ID
      * @return 结果
      */
-    public int deleteTWarehouseWarehousecheckByIds(Long[] fIds);
+    public AjaxResult deleteTWarehouseWarehousecheckByIds(Long[] fIds);
 
     /**
      * 删除巡检主信息
@@ -61,4 +63,12 @@ public interface ITWarehouseWarehousecheckService
      * @return 结果
      */
     public int deleteTWarehouseWarehousecheckById(Long fId);
+    /**
+     * 新增巡检信息
+     *
+     * @param tWarehouseWareHouseCheck 巡检主
+     * @param TWarehouseWareHouseCheckItems 巡检从
+     * @return 结果
+     */
+    public AjaxResult tWarehouseWareHouseCheckInsert(String tWarehouseWareHouseCheck, String TWarehouseWareHouseCheckItems, LoginUser loginUser);
 }

ruoyi-warehouse/src/main/java/com/ruoyi/warehouseBusiness/service/impl/TWarehouseWarehousecheckServiceImpl.java

@@ -1,12 +1,25 @@
 package com.ruoyi.warehouseBusiness.service.impl;
 
+import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheck;
+import com.ruoyi.warehouseBusiness.domain.TWarehouseWarehousecheckitems;
 import com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckMapper;
+import com.ruoyi.warehouseBusiness.mapper.TWarehouseWarehousecheckitemsMapper;
 import com.ruoyi.warehouseBusiness.service.ITWarehouseWarehousecheckService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 /**
  * 巡检主Service业务层处理
@@ -19,6 +32,8 @@ public class TWarehouseWarehousecheckServiceImpl implements ITWarehouseWarehouse
 {
     @Autowired
     private TWarehouseWarehousecheckMapper tWarehouseWarehousecheckMapper;
+    @Autowired
+    private TWarehouseWarehousecheckitemsMapper tWarehouseWarehousecheckitemsMapper;
 
     /**
      * 查询巡检主
@@ -27,9 +42,16 @@ public class TWarehouseWarehousecheckServiceImpl implements ITWarehouseWarehouse
      * @return 巡检主
      */
     @Override
-    public TWarehouseWarehousecheck selectTWarehouseWarehousecheckById(Long fId)
+    public AjaxResult selectTWarehouseWarehousecheckById(Long fId)
     {
-        return tWarehouseWarehousecheckMapper.selectTWarehouseWarehousecheckById(fId);
+        Map<String, Object> map = new HashMap<>();
+        TWarehouseWarehousecheck tWarehouseWareHouseCheck = tWarehouseWarehousecheckMapper.selectTWarehouseWarehousecheckById(fId);
+        TWarehouseWarehousecheckitems checkItemsHouse = new TWarehouseWarehousecheckitems();
+        checkItemsHouse.setfPid(fId);
+        List<TWarehouseWarehousecheckitems> tWarehouseWareHouseCheckItems = tWarehouseWarehousecheckitemsMapper.selectTWarehouseWarehousecheckitemsList(checkItemsHouse);
+        map.put("tWarehouseWareHouseCheck",tWarehouseWareHouseCheck);
+        map.put("tWarehouseWareHouseCheckItems",tWarehouseWareHouseCheckItems);
+        return AjaxResult.success(map);
     }
 
     /**
@@ -77,9 +99,17 @@ public class TWarehouseWarehousecheckServiceImpl implements ITWarehouseWarehouse
      * @return 结果
      */
     @Override
-    public int deleteTWarehouseWarehousecheckByIds(Long[] fIds)
+    @Transactional
+    public AjaxResult deleteTWarehouseWarehousecheckByIds(Long[] fIds)
     {
-        return tWarehouseWarehousecheckMapper.deleteTWarehouseWarehousecheckByIds(fIds);
+        int check = tWarehouseWarehousecheckMapper.updateTWarehouseWarehousecheckById(fIds);
+        int checkitems = tWarehouseWarehousecheckitemsMapper.updateTWarehouseWarehousecheckitemsById(fIds);
+        if (check>0){
+            return AjaxResult.success();
+        }else {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return AjaxResult.error("删除失败");
+        }
     }
 
     /**
@@ -93,4 +123,34 @@ public class TWarehouseWarehousecheckServiceImpl implements ITWarehouseWarehouse
     {
         return tWarehouseWarehousecheckMapper.deleteTWarehouseWarehousecheckById(fId);
     }
+
+    @Override
+    @Transactional
+    public AjaxResult tWarehouseWareHouseCheckInsert(String tWarehouseWareHouseCheck, String TWarehouseWareHouseCheckItems, LoginUser loginUser) {
+        TWarehouseWarehousecheck tWarehouseWarehousecheck = JSONArray.parseObject(tWarehouseWareHouseCheck, TWarehouseWarehousecheck.class);
+        if (tWarehouseWarehousecheck.getfId() == null){
+            tWarehouseWarehousecheck.setCreateTime(new Date());
+            tWarehouseWarehousecheck.setCreateBy(loginUser.getUsername());
+        }else {
+            tWarehouseWarehousecheck.setUpdateTime(new Date());
+            tWarehouseWarehousecheck.setUpdateBy(loginUser.getUsername());
+        }
+        //保存主表新
+        int i = tWarehouseWarehousecheckMapper.insertTWarehouseWarehousecheck(tWarehouseWarehousecheck);
+        JSONArray warehouseJSON = JSONArray.parseArray(TWarehouseWareHouseCheckItems);
+        List<TWarehouseWarehousecheckitems> checkItemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehouseWarehousecheckitems.class);
+        if (CollectionUtils.isNotEmpty(checkItemsList)){
+            for (TWarehouseWarehousecheckitems tWarehouseWarehousecheckitems : checkItemsList) {
+                if (tWarehouseWarehousecheckitems.getfId() == null){
+                    tWarehouseWarehousecheckitems.setCreateTime(new Date());
+                    tWarehouseWarehousecheckitems.setCreateBy(loginUser.getUsername());
+                }else {
+                    tWarehouseWarehousecheckitems.setUpdateTime(new Date());
+                    tWarehouseWarehousecheckitems.setUpdateBy(loginUser.getUsername());
+                }
+                int i1 = tWarehouseWarehousecheckitemsMapper.insertTWarehouseWarehousecheckitems(tWarehouseWarehousecheckitems);
+            }
+        }
+        return AjaxResult.success();
+    }
 }

ruoyi-warehouse/src/main/resources/mapper/quotation/TSeapriceMapper.xml

@@ -21,26 +21,32 @@
         <result property="remarks" column="remarks"/>
         <result property="fLineid" column="f_lineid"/>
         <result property="fBookagentid" column="f_bookagentid"/>
+        <result property="fLineName" column="f_line_name"/>
+        <result property="fBookagentName" column="f_bookagent_name"/>
     </resultMap>
 
     <sql id="selectTSeapriceVo">
-        select f_id,
-               f_billtype,
-               f_corpid,
-               pol_id,
-               pod_id,
-               f_validdate,
-               f_date_changed,
-               f_billstatus,
-               del_flag,
-               create_by,
-               create_time,
-               update_by,
-               update_time,
-               remarks,
-               f_lineid,
-               f_bookagentid
-        from t_seaprice
+        select s.f_id,
+               s.f_billtype,
+               s.f_corpid,
+               s.pol_id,
+               s.pod_id,
+               s.f_validdate,
+               s.f_date_changed,
+               s.f_billstatus,
+               s.del_flag,
+               s.create_by,
+               s.create_time,
+               s.update_by,
+               s.update_time,
+               s.remarks,
+               s.f_lineid,
+               s.f_bookagentid,
+               j.f_name AS f_line_name,
+               q.f_name AS f_bookagent_name
+        from t_seaprice s
+                 LEFT JOIN t_address j ON s.f_lineid = j.f_id
+                 LEFT JOIN t_corps q ON s.f_bookagentid = q.f_id
     </sql>
 
     <select id="selectTSeapriceList" parameterType="TSeaprice" resultMap="TSeapriceResult">
@@ -66,7 +72,7 @@
 
     <select id="selectTSeapriceById" parameterType="Long" resultMap="TSeapriceResult">
         <include refid="selectTSeapriceVo"/>
-        where f_id = #{fId}
+        where s.f_id = #{fId}
     </select>
 
     <select id="selectTSeapriceMapList" parameterType="TSeaprice" resultType="Map">
@@ -136,9 +142,7 @@
     </select>
 
     <select id="selectSeapriceItem" parameterType="TSeaprice" resultType="Map">
-        SELECT f.f_name                                                 fFeeid,
-               IF
-                   (s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
+        SELECT f.f_name fFeeid,s.remark remark,IF(s.f_type = '0', s.${fSpecification}, s.f_unitprice) fUnitprice
         FROM t_seaprice t
                  LEFT JOIN t_seapriceitem s ON s.f_pid = t.f_id
                  LEFT JOIN t_fees f ON f.f_id = s.f_feeid

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseWarehousecheckMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTWarehouseWarehousecheckList" parameterType="TWarehouseWarehousecheck" resultMap="TWarehouseWarehousecheckResult">
         <include refid="selectTWarehouseWarehousecheckVo"/>
         <where>
+            del_flag = '1'
             <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
             <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
             <if test="plannedDate != null "> and planned_date = #{plannedDate}</if>
@@ -103,5 +104,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fId}
         </foreach>
     </delete>
+    <update id="updateTWarehouseWarehousecheckById" parameterType="TWarehouseWarehousecheck">
+        update t_warehouse_warehousecheck
+         set del_flag = '1'
+        where f_id in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </update>
 
 </mapper>

ruoyi-warehouse/src/main/resources/mapper/warehouseBusiness/TWarehouseWarehousecheckitemsMapper.xml

@@ -29,6 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTWarehouseWarehousecheckitemsList" parameterType="TWarehouseWarehousecheckitems" resultMap="TWarehouseWarehousecheckitemsResult">
         <include refid="selectTWarehouseWarehousecheckitemsVo"/>
         <where>
+            del_flag = '0'
             <if test="fPid != null "> and f_pid = #{fPid}</if>
             <if test="fWarehouseid != null  and fWarehouseid != ''"> and f_warehouseid = #{fWarehouseid}</if>
             <if test="fWarehousename != null  and fWarehousename != ''"> and f_warehousename like concat('%', #{fWarehousename}, '%')</if>
@@ -112,5 +113,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{fId}
         </foreach>
     </delete>
+    <update id="updateTWarehouseWarehousecheckitemsById" parameterType="TWarehouseWarehousecheckitems">
+        update t_warehouse_warehousecheckitems
+        set
+            del_flag = '1'
+        where f_pid in
+        <foreach item="fId" collection="array" open="(" separator="," close=")">
+            #{fId}
+        </foreach>
+    </update>
 
 </mapper>