凯和单航次配船修改提示,到港卸货清空箱信息备注

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

@@ -362,6 +362,7 @@
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="remark == null">remark = null,</if>
             <if test="fBuildBoxTime != null">f_build_box_time = #{fBuildBoxTime},</if>
             <if test="fBoxTurtleYear != null">f_box_turtle_year = #{fBoxTurtleYear},</if>
             <if test="fBoxTurtleMonth != null">f_box_turtle_month = #{fBoxTurtleMonth},</if>

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

@@ -5303,7 +5303,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
 
                 }
                 if (CollectionUtils.isNotEmpty(list) || CollectionUtils.isNotEmpty(boxMessage)){
-                    String message = null;
+                    String message = "";
                     if (CollectionUtils.isNotEmpty(boxMessage) && CollectionUtils.isNotEmpty(list)){
                         StringBuffer stringBuffer = new StringBuffer("订单缺少箱信息或者箱量不足,订单号为:");
                         stringBuffer.append(org.apache.commons.lang.StringUtils.join(boxMessage.toArray(), ","));
@@ -6021,7 +6021,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
                         cntrno.setUpdateTime(date);
                         cntrno.setUpdateBy(loginUser.getUser().getUserName());
                         cntrno.setfUpdatetime(date);
-                        cntrno.setRemark(remark);
+                        cntrno.setRemark(null);
                         cntrno.setfUpdateaddress(bills.getfDestportid().toString());
                         cntrno.setfOpctnstatus(fOpCTnsTaTus);
                         cntrno.setfCntrstatus(warehousebillsCntr.getfCntrstatus());