|
|
@ -36,7 +36,9 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
|
|
|
|
|
|
|
|
|
|
|
|
StringBuffer hql = new StringBuffer("select mll.order_code ,mll.cust_name ,mll.cust_organize_name ,mll.shipping_group_name , ");
|
|
|
|
StringBuffer hql = new StringBuffer("select mll.order_code ,mll.cust_name ,mll.cust_organize_name ,mll.shipping_group_name , ");
|
|
|
|
hql.append(" mlld.status , mll.truck_no ,mll.weather , ms.shipping_code ,ms.start_scan_time ,ms.end_scan_time ,ms.status as shipStatus , ");
|
|
|
|
hql.append(" mlld.status , mll.truck_no ,mll.weather , ms.shipping_code ,ms.start_scan_time ,ms.end_scan_time ,ms.status as shipStatus , ");
|
|
|
|
hql.append(" mlld.create_date_time , mll.create_user ,mll.modify_date_time , ms.modify_user ");
|
|
|
|
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 , ms.shipping_group_name , ");
|
|
|
|
|
|
|
|
hql.append(" mll.truck_no , ms.start_scan_time ,ms.end_scan_time ");
|
|
|
|
hql.append(" from mes_loading_list as mll");
|
|
|
|
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(" 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 ");
|
|
|
|
hql.append(" and mll.organize_code = mlld.organize_code and mll.is_deleted = mlld.is_deleted and mll.is_valid = mlld.is_valid ");
|
|
|
@ -90,6 +92,13 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
|
|
|
|
model.setCreateUser(StringUtils.isEmpty(cells[12]) ? "" : String.valueOf(cells[12]));
|
|
|
|
model.setCreateUser(StringUtils.isEmpty(cells[12]) ? "" : String.valueOf(cells[12]));
|
|
|
|
model.setModifyDatetime(StringUtils.isEmpty(cells[13]) ? "" : String.valueOf(cells[13]));
|
|
|
|
model.setModifyDatetime(StringUtils.isEmpty(cells[13]) ? "" : String.valueOf(cells[13]));
|
|
|
|
model.setModifyUser(StringUtils.isEmpty(cells[14]) ? "" : String.valueOf(cells[14]));
|
|
|
|
model.setModifyUser(StringUtils.isEmpty(cells[14]) ? "" : String.valueOf(cells[14]));
|
|
|
|
|
|
|
|
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.setShippingGroupName(StringUtils.isEmpty(cells[18]) ? "" : String.valueOf(cells[18]));
|
|
|
|
|
|
|
|
model.setTruckNo(StringUtils.isEmpty(cells[19]) ? "" : String.valueOf(cells[19]));
|
|
|
|
|
|
|
|
model.setStartScanTime(StringUtils.isEmpty(cells[20]) ? "" : String.valueOf(cells[20]));
|
|
|
|
|
|
|
|
model.setEndScanTime(StringUtils.isEmpty(cells[21]) ? "" : String.valueOf(cells[21]));
|
|
|
|
|
|
|
|
|
|
|
|
modelList.add(model);
|
|
|
|
modelList.add(model);
|
|
|
|
}
|
|
|
|
}
|
|
|
|