解决查看审批流报错异常，解决车队配载问题

ruoyi-fleet/src/main/java/com/ruoyi/orderPlan/service/impl/FtmsorderbillscarsServiceImpl.java

@@ -521,12 +521,12 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         if (ftmsorderbillscars.getOrderStatus() > 80L || ftmsorderbillscars.getBillStatus() > 6) {
             return AjaxResult.error("该运单已回单或已完成无法撤销配载");
         }
-        ftmsorderbillscars.setmBillNo(null);
+        ftmsorderbillscars.setmBillNo("");
         ftmsorderbillscars.setBillKind("NN");
         ftmsorderbillscars.setUpdateTime(new Date());
         ftmsorderbillscars.setUpdateBy(SecurityUtils.getUsername());
         ftmsorderbillscarsMapper.updateftmsorderbillscars(ftmsorderbillscars);
-        tmsorderbillscars.setmBillNo(null);
+        tmsorderbillscars.setmBillNo("");
         tmsorderbillscars.setBillKind("NN");
         tmsorderbillscars.setUpdateTime(new Date());
         tmsorderbillscars.setUpdateBy(SecurityUtils.getUsername());
@@ -549,6 +549,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
         if (tmsorderbillscars.getOrderStatus() > 80L) {
             return AjaxResult.error("该运单已回单无法配载");
         }
+        if (!"NN".equals(tmsorderbillscars.getBillKind())) {
+            return AjaxResult.error("配载失败，该运单已参与配载");
+        }
         Ftmsorderbillscars orderNoCars = ftmsorderbillscarsMapper.selectftmsorderbillscarsByOrderNo(ftmsorderbillscars.getmBillNo());
         if (StringUtils.isNull(orderNoCars)) {
             return AjaxResult.error("未找到配载的运单信息，请确认是否存在该运单");

ruoyi-fleet/src/main/resources/mapper/orderPlan/ftmsorderbillscarsMapper.xml

@@ -1064,6 +1064,7 @@
             <if test="amtDr != null">amt_dr = #{amtDr},</if>
             <if test="amtCr != null">amt_cr = #{amtCr},</if>
             <if test="mBillNo != null">m_bill_no = #{mBillNo},</if>
+            <if test="mBillNo == ''">m_bill_no = null,</if>
             <if test="billKind != null">bill_kind = #{billKind},</if>
             <if test="dueDateDr != null">due_date_dr = #{dueDateDr},</if>
             <if test="dueDateCr != null">due_date_cr = #{dueDateCr},</if>

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

@@ -376,8 +376,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
             e.printStackTrace();
         }
         // 箱号
-        if (StringUtils.isNotEmpty(warehousebillsitems.getfBoxno())) {
-            tWhgenleg.setfCntrno(warehousebillsitems.getfBoxno());
+        if (StringUtils.isNotEmpty(warehousebillsitems.getfCntrno())) {
+            tWhgenleg.setfCntrno(warehousebillsitems.getfCntrno());
         }
         // 库区
         tWhgenleg.setfWarehouseLocationid(warehousebillsitems.getfWarehouselocid());

ruoyi-warehouse/src/main/resources/mapper/approvalFlow/AuditItemsMapper.xml

@@ -275,8 +275,8 @@
             aud.audit_status AS auditStatus,
             aud.audit_msg AS auditMsg,
             aud.audit_item AS auditItem,
-            aud.audit_op_time AS auditOpTime
-            aud.bill_time AS billTime,
+            aud.audit_op_time AS auditOpTime,
+            aud.bill_time AS billTime
         FROM
             audit_items aud
             LEFT JOIN sys_user us ON us.user_id = aud.audit_user_id