凯和修改

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

@@ -6919,15 +6919,12 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
     @Override
     @Transactional
     public AjaxResult updateBoxMessage(TCntrnoMessage tCntrno, LoginUser loginUser) {
-        String remark = tCntrno.getfVsl() + tCntrno.getfVoy();
         Date date = tCntrno.getfUpdatetime();
         //查询船名航次对应的信息
         TWarehouseBills tWarehouseBills = new TWarehouseBills();
-       /* tWarehouseBills.setfVslid(tCntrno.getfVslid());
-        tWarehouseBills.setfVoyid(tCntrno.getfVoyid());*/
         tWarehouseBills.setBillList(tCntrno.getBillList());
         tWarehouseBills.setfCargoPlanning(0L);
-        if (tCntrno.getUpdateStatus().longValue() == 1) {
+        if (tCntrno.getUpdateStatus() == 1) {
             tWarehouseBills.setfArrivalStatus(0);
             List<TWarehouseBills> tWarehouseBillsList = tWarehouseBillsMapper.webVersionOrderList(tWarehouseBills);
             if (CollectionUtils.isEmpty(tWarehouseBillsList)) {
@@ -6971,7 +6968,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         if (cntrnoById == null) {
                             continue;
                         }
-                        if (cntrnoById.getfStatus().equals("T") || cntrnoById.getfStatus().equals("正常")) {
+                        if ("T".equals(cntrnoById.getfStatus()) || "正常".equals(cntrnoById.getfStatus())) {
                             cntrnoById.setfStatus("T");
                         } else {
                             cntrnoById.setfStatus("F");
@@ -6981,6 +6978,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         tCntrtracking.setfId(null);
                         tCntrtracking.setfVoy(tCntrno.getfVoy());//航次
                         tCntrtracking.setfVsl(tCntrno.getfVsl());//船名
+                        tCntrtracking.setfMblno(bills.getfMblno());
+                        tCntrtracking.setfSealno(warehousebillsCntritem.getfSealno());
                         tCntrtrackingMapper.insertTCntrtracking(tCntrtracking);
                     }
                 }
@@ -6991,7 +6990,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 tWarehouseBillsMapper.updateKaHeOrder(warehouseBills);
             }
 
-        } else if (tCntrno.getUpdateStatus().longValue() == 2) {
+        } else if (tCntrno.getUpdateStatus() == 2) {
             tWarehouseBills.setfArrivalStatus(1);
             List<TWarehouseBills> tWarehouseBillsList = tWarehouseBillsMapper.webVersionOrderList(tWarehouseBills);
             if (CollectionUtils.isEmpty(tWarehouseBillsList)) {
@@ -7005,11 +7004,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                 return AjaxResult.error("系统缺少箱动态卸船请维护");
             }
             for (TWarehouseBills bills : tWarehouseBillsList) {
-                String address = null;
-                if (StringUtils.isNotEmpty(tCntrno.getfUpdateaddress())){
+                String address;
+                if (StringUtils.isNotEmpty(tCntrno.getfUpdateaddress())) {
                     address = tCntrno.getfUpdateaddress();
-                }else {
-                   address = bills.getfDestportid().toString();
+                } else {
+                    address = bills.getfDestportid().toString();
                 }
                 //查询货物信息
                 TWarehousebillsCntr warehousebillsCntr = tWarehousebillsCntrMapper.selectTWarehousebillsCntrByPId(bills.getfId());
@@ -7031,7 +7030,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         tCntrnoMapper.updateTCntrnoByfNo(cntrno);
                         //保存历史信息
                         TCntrno cntrnoById = tCntrnoMapper.selectTCnTrNoByfNo(warehousebillsCntritem.getfCntrno());
-                        if (cntrnoById.getfStatus().equals("T") || cntrnoById.getfStatus().equals("正常")) {
+                        if ("T".equals(cntrnoById.getfStatus()) || "正常".equals(cntrnoById.getfStatus())) {
                             cntrnoById.setfStatus("T");
                         } else {
                             cntrnoById.setfStatus("F");
@@ -7041,6 +7040,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         tCntrtracking.setfId(null);
                         tCntrtracking.setfVoy(tCntrno.getfVoy());//航次
                         tCntrtracking.setfVsl(tCntrno.getfVsl());//船名
+                        tCntrtracking.setfMblno(bills.getfMblno());
+                        tCntrtracking.setfSealno(warehousebillsCntritem.getfSealno());
                         tCntrtrackingMapper.insertTCntrtracking(tCntrtracking);
                     }
                 }

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

@@ -2893,10 +2893,10 @@
                         #{fConsigneername}, '%')
                     </if>
                     <if test='cLoadDate != null and cLoadDate[0] != null and cLoadDate[0]!= ""'>
-                        and tw.f_bsdate &gt;= #{cLoadDate[0]}
+                        and tw.create_time &gt;= #{cLoadDate[0]}
                     </if>
                     <if test='cLoadDate != null and cLoadDate[1] != null and cLoadDate[1]!= ""'>
-                        and tw.f_bsdate &lt;= #{cLoadDate[1]}
+                        and tw.create_time &lt;= #{cLoadDate[1]}
                     </if>
                     <if test="fCargoPlanning != null "> and tw.f_cargo_planning = #{fCargoPlanning}</if>
                     <if test="fArrivalStatus != null "> and tw.f_arrival_status = #{fArrivalStatus}</if>