发运单明细页面显示备注字段

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/MesLoadingListDetailDaoImpl.java

@@ -37,7 +37,7 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
         StringBuffer hql = new StringBuffer("select mll.order_code ,mll.cust_name ,mll.cust_organize_name ,mll.shipping_group_name , ");
         hql.append(" mll.status , mll.truck_no ,mll.weather , ms.shipping_code ,ms.start_scan_time ,ms.end_scan_time ,mlld.status as shipStatus , ");
         hql.append(" mlld.create_date_time , mll.create_user ,mll.modify_date_time , ms.modify_user , ");
-        hql.append(" mll.cust_code , mll.cust_organize_code ,mll.shipping_group_code  ");
+        hql.append(" mll.cust_code , mll.cust_organize_code ,mll.shipping_group_code,mlld.remark  ");
         hql.append(" from mes_loading_list as mll");
         hql.append(" inner join  mes_loading_list_detail as mlld on mll.id = mlld.pid");
         hql.append(" and mll.organize_code = mlld.organize_code and mll.is_deleted = mlld.is_deleted and mll.is_valid = mlld.is_valid  ");
@@ -94,6 +94,7 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
             model.setCustCode(StringUtils.isEmpty(cells[15]) ? "" : String.valueOf(cells[15]));
             model.setCustOrganizeCode(StringUtils.isEmpty(cells[16]) ? "" : String.valueOf(cells[16]));
             model.setShippingGroupCode(StringUtils.isEmpty(cells[17]) ? "" : String.valueOf(cells[17]));
+            model.setRemark(StringUtils.isEmpty(cells[18]) ? "" : String.valueOf(cells[18]));
 
             modelList.add(model);
         }

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/MesLoadingListDetailModel.java

@@ -64,4 +64,7 @@ public class MesLoadingListDetailModel {
     @ApiParam("修改日期")
     public String modifyDatetime;
 
+    @ApiParam("备注")
+    public String remark;
+
 }