代码修改

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCntrnoServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.shipping.domain.TCntrno;
 import com.ruoyi.shipping.service.ITCntrnoService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 集装箱号Service业务层处理
@@ -86,6 +87,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
      * @return 结果
      */
     @Override
+    @Transactional
     public int updateTCntrno(List<TCntrno> tCntrno)
     {
         int update = 0;
@@ -152,6 +154,7 @@ public class TCntrnoServiceImpl implements ITCntrnoService
     }
 
     @Override
+    @Transactional
     public int updateTCntrnoMessage(TCntrno tCntrno) {
         tCntrno.setUpdateTime(DateUtils.getNowDate());
         tCntrno.setUpdateBy(SecurityUtils.getUsername());

ruoyi-shipping/src/main/java/com/ruoyi/shipping/service/impl/TCtnpriceServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.shipping.mapper.TCtnpriceMapper;
 import com.ruoyi.shipping.domain.TCtnprice;
 import com.ruoyi.shipping.service.ITCtnpriceService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 海运运价Service业务层处理
@@ -84,6 +85,7 @@ public class TCtnpriceServiceImpl implements ITCtnpriceService
     }
 
     @Override
+    @Transactional
     public AjaxResult insertTCtnpriceNew(String tCtnprice, String tCtnpriceItems) {
         TCtnprice ctnprice = JSONArray.parseObject(tCtnprice, TCtnprice.class);
         if (ctnprice.getfPortofloadid() == null){
@@ -180,6 +182,7 @@ public class TCtnpriceServiceImpl implements ITCtnpriceService
      * @return 结果
      */
     @Override
+    @Transactional
     public int deleteTCtnpriceByIds(Long[] fIds)
     {
         int i;

ruoyi-shipping/src/main/resources/mapper/shipping/TCntrnoMapper.xml

@@ -111,7 +111,7 @@
             <if test="tc.fCntrstatus != null  and tc.fCntrstatus != ''">and tc.f_cntrstatus = #{tc.fCntrstatus}</if>
             <if test="tc.fStatus != null  and tc.fStatus != ''">and tc.f_status = #{tc.fStatus}</if>
             <if test="tc.fOpctnstatus != null  and tc.fOpctnstatus != ''">and tc.f_opctnstatus = #{tc.fOpctnstatus}</if>
-            <if test="fSealno != null  and fSealno != ''">and tc.f_sealno = #{fSealno}</if>
+            <if test="tc.fSealno != null  and tc.fSealno != ''">and tc.f_sealno = #{tc.fSealno}</if>
             <if test='tc.cLoadDate != null and tc.cLoadDate[0] != null and tc.cLoadDate[0]!= ""'>
                 and tc.create_time &gt;= #{tc.cLoadDate[0]}
             </if>

ruoyi-shipping/src/main/resources/mapper/shipping/TVoyageMapper.xml

@@ -113,8 +113,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTVoyageById" parameterType="Long" resultMap="TVoyageResult">
-        <include refid="selectTVoyageVo"/>
-        where f_id = #{fId}
+        SELECT
+            tv.f_id,
+            tv.f_pid,
+            te.f_name pidName,
+            tv.f_no,
+            tv.f_portofloadid,
+            ta.f_name portofloadidName,
+            tv.f_portofdischargeid,
+            td.f_name portofdischargeidName,
+            tv.f_distinationid,
+            tr.f_name distinationidName,
+            tv.f_portoftransshipment,
+            ts.f_name portoftransshipmentName,
+            tv.f_ETD,
+            tv.f_ATD,
+            tv.f_ETA,
+            tv.f_ATA,
+            tv.f_days,
+            tv.f_ducomentrayoffdate,
+            tv.f_cutoffdate,
+            tv.f_teu,
+            tv.f_manageid,
+            su.user_name manageidName,
+            tv.f_tel,
+            CASE
+
+                WHEN tv.f_status = 'T' THEN
+                    '正常' ELSE '停用'
+                END AS f_status,
+            TIMESTAMPDIFF(
+                    DAY,
+                    tv.f_ETD,
+                    DATE_FORMAT( tv.f_cutoffdate, '%Y-%m-%d %H:%i:%S' )) closing,
+            tv.create_by,
+            tv.create_time,
+            tv.update_by,
+            tv.update_time,
+            tv.remark
+        FROM
+            t_voyage tv
+                LEFT JOIN t_vessel te ON tv.f_pid = te.f_id
+                LEFT JOIN t_address ta ON tv.f_portofloadid = ta.f_id
+                LEFT JOIN t_address td ON tv.f_portofdischargeid = td.f_id
+                LEFT JOIN t_address tr ON tv.f_distinationid = tr.f_id
+                LEFT JOIN t_address ts ON tv.f_portoftransshipment = ts.f_id
+                LEFT JOIN sys_user su ON tv.f_manageid = su.user_id
+        WHERE
+            tv.f_id = #{fId}
     </select>
 
     <insert id="insertTVoyage" parameterType="TVoyage" useGeneratedKeys="true" keyProperty="fId">

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

@@ -741,9 +741,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setIffinalItem("F");
             auditItems.setBillNo(warehouseBills.getfBillno());
             // 存储委托方（货权方）
-            //auditItems.setRefno1(warehouseBills.getfCorpid() + "");
+            auditItems.setRefno1(warehouseBills.getfCorpid() + "");
             // 存储业务类型（业务类型）
-            //auditItems.setRefno2(warehouseBills.getfBilltype());
+            auditItems.setRefno2(warehouseBills.getfBilltype());
             // 存储提单号（提单号）
             auditItems.setRefno3(warehouseBills.getfMblno());
             auditItems.setSendUserId(loginUser.getUser().getUserId());
@@ -777,6 +777,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * @return
      */
     @Override
+    @Transactional
     public AjaxResult TSMakingMessage(String tWarehousebills, String tWarehousebillsCntritems, String billsType, LoginUser loginUser) {
         Map<String, Object> map = new HashMap<>();
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehousebills, TWarehouseBills.class);
@@ -812,6 +813,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
      * @return
      */
     @Override
+    @Transactional
     public AjaxResult submitMakingMessage(String tWarehousebills, String tWarehousebillsCntritems, String billsType, LoginUser loginUser) {
         boolean isApprove = false;//是否开启审批流
         String key = "";//键
@@ -842,9 +844,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             warehouseBills.setfBillstatus(11L);
         }
         TWarehouseBills tWarehouseBills = tWarehouseBillsMapper.selectTWarehousebillsById(warehouseBills.getfId());
-        if (!"6".equals(tWarehouseBills.getfBillstatus())
-                || !"7".equals(warehouseBills.getfBillstatus())
-                || !"8".equals(tWarehouseBills.getfBillstatus())){
+        if (tWarehouseBills.getfBillstatus()== 6L
+                || tWarehouseBills.getfBillstatus() == 7L
+                || tWarehouseBills.getfBillstatus() == 8L){
+        }else {
             return AjaxResult.error("当前数据不允许提交");
         }
         tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
@@ -857,6 +860,10 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 int cntr = tWarehousebillsCntritemsMapper.insertTWarehousebillsCntritems(warehousebillsCntritems);
             }
         }
+        TWarehousebillsCntr warehousebillsCntr = new TWarehousebillsCntr();
+        warehousebillsCntr.setfPid(warehouseBills.getfId());
+        List<TWarehousebillsCntr> tWarehousebillsCntrs = tWarehousebillsCntrMapper.selectTWarehousebillsCntrList(warehousebillsCntr);
+        TVoyage tVoyage = tVoyageMapper.selectTVoyageById(warehouseBills.getfVoyid());
         if (isApprove) {
             AuditItems auditItems = new AuditItems();
             auditItems.setLevelId(0L);
@@ -865,9 +872,9 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             auditItems.setIffinalItem("F");
             auditItems.setBillNo(warehouseBills.getfBillno());
             // 存储委托方（货权方）
-            //auditItems.setRefno1(warehouseBills.getfCorpid() + "");
+            auditItems.setRefno1(warehouseBills.getfCorpid() + "");
             // 存储业务类型（业务类型）
-           // auditItems.setRefno2(warehouseBills.getfBilltype());
+            auditItems.setRefno2(warehouseBills.getfBilltype());
             // 存储提单号（提单号）
             //auditItems.setRefno3(warehouseBills.getfMblno());
             auditItems.setSendUserId(loginUser.getUser().getUserId());
@@ -888,6 +895,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             return approvalFlow;
         }
         map.put("warehouseBills", warehouseBills);
+        map.put("tWarehousebillsCntrs", tWarehousebillsCntrs);
+        map.put("tVoyageL", tVoyage);
         map.put("tWarehousebillsCntritems", tWarehousebillsCntritemsList);
         return AjaxResult.success("msg", map);
     }
@@ -1365,6 +1374,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     }
 
     @Override
+    @Transactional
     public AjaxResult ruoYiUpdateOrderMessage(String tWarehousebills,String tWarehousebillsCntritems,String tWarehousebillsfeesCr,
                                               String tWarehousebillsfeesDr,LoginUser loginUser,String billsType) {
         TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehousebills, TWarehouseBills.class);
@@ -1403,8 +1413,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbCr.setCreateTime(new Date());
                 wbCr.setSrcBillNo(warehouseBills.getfBillno());
                 wbCr.setCreateBy(loginUser.getUser().getUserName());
-                wbCr.setfChargedate(warehouseBills.getfChargedate());
-                wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
+                //wbCr.setfChargedate(warehouseBills.getfChargedate());
+                //wbCr.setfBillingDeadline(warehouseBills.getfChargedate());
                 if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
                     wbCr.setfBsdate(warehouseBills.getfBsdate());
                 }
@@ -1422,8 +1432,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 wbDr.setCreateTime(new Date());
                 wbDr.setSrcBillNo(warehouseBills.getfBillno());
                 wbDr.setCreateBy(loginUser.getUser().getUserName());
-                wbDr.setfChargedate(warehouseBills.getfChargedate());
-                wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
+                //wbDr.setfChargedate(warehouseBills.getfChargedate());
+                //wbDr.setfBillingDeadline(warehouseBills.getfChargedate());
                 if (warehouseBills.getfBsdate() != null && !warehouseBills.getfBsdate().equals("")) {
                     wbDr.setfBsdate(warehouseBills.getfBsdate());
                 }

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

@@ -972,9 +972,9 @@
             <if test="fDocmentdate != null">#{fDocmentdate},</if>
             <if test="fVslid != null">#{fVslid},</if>
             <if test="fVoyid != null">#{fVoyid},</if>
-            <if test="fTypeid != null">#{fTypeid},</if>
             <if test="fPaymode != null">#{fPaymode},</if>
             <if test="fLaneid != null">#{fLaneid},</if>
+            <if test="fTypeid != null">#{fTypeid},</if>
         </trim>
     </insert>
 
@@ -1061,9 +1061,9 @@
             <if test="fDocmentdate != null">f_docmentdate = #{fDocmentdate},</if>
             <if test="fVslid != null">f_vslid = #{fVslid},</if>
             <if test="fVoyid != null">f_voyid = #{fVoyid},</if>
-            <if test="fTypeid != null">f_typeid = #{fTypeid},</if>
             <if test="fPaymode != null">f_paymode = #{fPaymode},</if>
             <if test="fLaneid != null">f_laneid = #{fLaneid},</if>
+            <if test="fTypeid != null">f_typeid = #{fTypeid},</if>
         </trim>
         where f_id = #{fId}
     </update>
@@ -1460,36 +1460,65 @@
         tw.f_bsdate fBsdate,
         tc.f_cntrcount fCntrcount,
         tc.f_no fNo,
+        tv.f_name vslName,
+        ty.f_no voyNo,
+        tw.f_corpid,
+        tp.f_name corpName,
+        tw.create_by createBy,
+        tw.create_time createTime,
+        tw.f_loadportid,
+        tre.f_name loadportName,
+        tw.f_destportid,
+        ts.f_name  ,
+        tc.f_name goodsName,
         CASE
-        WHEN tw.f_billstatus = '1' THEN '下单新建'
-        WHEN tw.f_billstatus = '2' THEN '下单暂存'
-        WHEN tw.f_billstatus = '3' THEN '下单驳回'
-        WHEN tw.f_billstatus = '4' THEN '下单提交'
-        WHEN tw.f_billstatus = '5' THEN '下单审批中'
-        WHEN tw.f_billstatus = '6' THEN '下单审批通过'
-        WHEN tw.f_billstatus = '7' THEN '配船暂存'
-        WHEN tw.f_billstatus = '8' THEN '配船驳回'
-        WHEN tw.f_billstatus = '9' THEN '配船提交'
-        WHEN tw.f_billstatus = '10' THEN '配船审批中'
-        WHEN tw.f_billstatus = '11' THEN '配船审批通过'
-        WHEN tw.f_billstatus = '12' THEN '运单变更'
+
+        WHEN tw.f_billstatus = '1' THEN
+        '下单新建'
+        WHEN tw.f_billstatus = '2' THEN
+        '下单暂存'
+        WHEN tw.f_billstatus = '3' THEN
+        '下单驳回'
+        WHEN tw.f_billstatus = '4' THEN
+        '下单提交'
+        WHEN tw.f_billstatus = '5' THEN
+        '下单审批中'
+        WHEN tw.f_billstatus = '6' THEN
+        '下单审批通过'
+        WHEN tw.f_billstatus = '7' THEN
+        '配船暂存'
+        WHEN tw.f_billstatus = '8' THEN
+        '配船驳回'
+        WHEN tw.f_billstatus = '9' THEN
+        '配船提交'
+        WHEN tw.f_billstatus = '10' THEN
+        '配船审批中'
+        WHEN tw.f_billstatus = '11' THEN
+        '配船审批通过'
+        WHEN tw.f_billstatus = '12' THEN
+        '运单变更'
         END AS fBillstatus
         FROM
         t_warehousebills tw
         LEFT JOIN t_address ta ON ta.f_id = tw.f_laneid
+        LEFT JOIN t_address tre ON tre.f_id = tw.f_loadportid
+        LEFT JOIN t_address ts ON ts.f_id = tw.f_destportid
         LEFT JOIN sys_dict_data sd ON sd.dict_value = tw.f_serviceitems
         AND sd.dict_type = 'f_serviceitems'
         LEFT JOIN t_vessel tv ON tw.f_vslid = tv.f_id
         LEFT JOIN t_voyage ty ON tw.f_voyid = ty.f_id
+        LEFT JOIN t_corps tp ON tw.f_corpid = tp.f_id
         LEFT JOIN (
         SELECT
         th.f_pid,
         th.f_cntrcount,
         tr.f_no,
-        th.f_cntrid
+        th.f_cntrid,
+        tg.f_name
         FROM
         t_warehousebills_cntr th
         LEFT JOIN t_cntr tr ON th.f_cntrid = tr.f_id
+        LEFT JOIN t_goods tg ON th.f_goodsid = tg.f_id
         ) tc ON tc.f_pid = tw.f_id
         <where>
             tw.f_typeid = '1'