|
|
|
@ -35,7 +35,8 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
|
|
|
|
|
public List<MesLoadingListDetailModel> queryLoadingListDetailModel(MesLoadingListDetail detail, Pager pager) {
|
|
|
|
|
|
|
|
|
|
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(" 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 ");
|
|
|
|
@ -79,6 +80,10 @@ public class MesLoadingListDetailDaoImpl implements IMesLoadingListDetailDao {
|
|
|
|
|
model.setStartScanTime(StringUtils.isEmpty(cells[8]) ? "" : String.valueOf(cells[8]));
|
|
|
|
|
model.setEndScanTime(StringUtils.isEmpty(cells[9]) ? "" : String.valueOf(cells[9]));
|
|
|
|
|
model.setShippingStatus(StringUtils.isEmpty(cells[10]) ? 0 : Integer.parseInt(String.valueOf(cells[10])));
|
|
|
|
|
model.setCreateDatetime(StringUtils.isEmpty(cells[11]) ? "" : String.valueOf(cells[11]));
|
|
|
|
|
model.setCreateUser(StringUtils.isEmpty(cells[12]) ? "" : String.valueOf(cells[12]));
|
|
|
|
|
model.setModifyDatetime(StringUtils.isEmpty(cells[13]) ? "" : String.valueOf(cells[13]));
|
|
|
|
|
model.setModifyUser(StringUtils.isEmpty(cells[14]) ? "" : String.valueOf(cells[14]));
|
|
|
|
|
|
|
|
|
|
modelList.add(model);
|
|
|
|
|
}
|
|
|
|
|