手机端 运输记录字段补充

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/dao/VehicleDispatchDaoImpl.java

@@ -108,6 +108,9 @@ public class VehicleDispatchDaoImpl extends AbstractBaseDao implements VehicleDi
         KClass bean = Amino.getStaticMetadataContext().getBean(ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
+        if(status!=null){
+            detachedCriteria.add(Restrictions.eq("dispatchStatus", status));
+        }
         detachedCriteria.createAlias(PLANNING_CYCLE, PLANNING_CYCLE);
         detachedCriteria.add(Restrictions.in("transportVehicle.id", collect));
         if (null != startDate) {

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/dao/VehicleDriverUserDaoImpl.java

@@ -13,10 +13,7 @@ import com.xyst.dinas.sales.constant.SalesRecordConstant;
 import com.xyst.dinas.transport.constant.VehicleDriverUserConstant;
 import com.xyst.dinas.transport.dao.VehicleDriverUserDao;
 import org.apache.commons.collections4.CollectionUtils;
-import org.hibernate.criterion.DetachedCriteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Restrictions;
+import org.hibernate.criterion.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateTemplate;
 
@@ -115,13 +112,16 @@ public class VehicleDriverUserDaoImpl extends AbstractBaseDao implements Vehicle
         KClass bean = Amino.getStaticMetadataContext().getBean(SalesRecordConstant.TRANSPORT_RECORD_ENTITY, KClass.class);
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
         detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
-        detachedCriteria.add(Restrictions.in("transportVehicle.id", collect));
+        Disjunction disjunction = Restrictions.disjunction();
+        disjunction.add(Restrictions.and(Restrictions.eq("driverUser.id",id),Restrictions.eq("confirmStatus",1)));
+        disjunction.add(Restrictions.and(Restrictions.in("transportVehicle.id", collect),Restrictions.eq("confirmStatus",0)));
+        detachedCriteria.add(disjunction);
         detachedCriteria.add(Restrictions.eq(SalesRecordConstant.REGIONALCOMPANY + "." + BaseConstants.ID, regionalCompanyId));
         if (null != startDate) {
-            detachedCriteria.add(Restrictions.le(BaseConstants.CREATE_TIME, DateTimeUtils.getStartDateTimeOfDay(startDate)));
+            detachedCriteria.add(Restrictions.ge(BaseConstants.CREATE_TIME, DateTimeUtils.getStartDateTimeOfDay(startDate)));
         }
         if (null != endDate) {
-            detachedCriteria.add(Restrictions.ge(BaseConstants.CREATE_TIME, DateTimeUtils.getEndDateTimeOfDay(endDate)));
+            detachedCriteria.add(Restrictions.le(BaseConstants.CREATE_TIME, DateTimeUtils.getEndDateTimeOfDay(endDate)));
         }
         detachedCriteria.addOrder(Order.desc(BaseConstants.CREATE_TIME));
         int offset = pageSize * (pageNo - 1);

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/service/VehicleDispatchServiceImpl.java

@@ -2,6 +2,7 @@ package com.xyst.dinas.transport.internal.service;
 
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.context.driver.DriverUserContextHolder;
+import com.beecode.inz.basis.dao.DriverUserDao;
 import com.beecode.inz.common.BaseConstants;
 import com.xyst.dinas.biz.dao.DinasTypeDao;
 import com.xyst.dinas.price.enumeration.PriceAdjustmentAdjustmentStatusEnum;
@@ -32,6 +33,9 @@ public class VehicleDispatchServiceImpl implements VehicleDispatchService {
     @Autowired
     private DinasTypeDao dinasTypeDao;
 
+    @Autowired
+    private DriverUserDao driverUserDao;
+
     @Override
     public UUID create(KObject kobject) {
         int dispatchType = kobject.getInt("dispatchType");
@@ -139,7 +143,7 @@ public class VehicleDispatchServiceImpl implements VehicleDispatchService {
         KObject load = vehicleDispatchDao.load(SalesRecordConstant.TRANSPORT_RECORD_ENTITY, map.get("id").toString());
         load.set("confirmStatus",1);
         load.set("confirmTime",new Date());
-        load.set("driverUser", DriverUserContextHolder.getContext().getDriverUser());
+        load.set("driverUser", driverUserDao.findById(DriverUserContextHolder.getContext().getDriverUser().getId()));
         load.set("receiverName", map.get("receiverName").toString());
         load.set("memo", map.get("memo").toString());
         load.set("contactNumber", map.get("contactNumber").toString());

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/internal/service/VehicleDriverUserServiceImpl.java

@@ -166,26 +166,40 @@ public class VehicleDriverUserServiceImpl implements VehicleDriverUserService {
         KObject saleRecord = data.get("saleRecord");
         KObject transportVehicle = data.get("transportVehicle");
         String projectName = saleRecord.get(SalesRecordConstant.PROJECT).getString("projectName");
-        String stationName = saleRecord.get(SalesRecordConstant.STATION).getString("stationName");
         String dinasTypeName = saleRecord.get(SalesRecordConstant.DINASTYPE).getString("dinasTypeName");
         BigDecimal dealAmount = saleRecord.getBigDecimal(SalesRecordConstant.DEALAMOUNT);
         BigDecimal price = saleRecord.getBigDecimal(SalesRecordConstant.PRICE);
         BigDecimal amount = saleRecord.getBigDecimal(SalesRecordConstant.AMOUNT);
+        String productionLineName = saleRecord.get(SalesRecordConstant.PRODUCTIONLINE).getString("name");
+        Date dealTime = saleRecord.getDate(SalesRecordConstant.DEALTIME);
+        String purchaseSandCompanyName = saleRecord.get(SalesRecordConstant.PURCHASESANDCOMPANY).getString("name");
+        String contractAddrReceive = saleRecord.get(SalesRecordConstant.CONTRACT).getString("addrReceive");
+
+
+        KObject station = saleRecord.get(SalesRecordConstant.STATION);
+        String stationName = station.getString("stationName");
+        String stationAddress = station.getString("stationAddress");
 
         String plateNumber = transportVehicle.getString("plateNumber");
 
         stringObjectHashMap.put("projectName",projectName);
+        stringObjectHashMap.put(BaseConstants.ID,data.get(BaseConstants.ID));
         stringObjectHashMap.put("stationName",stationName);
         stringObjectHashMap.put("dinasTypeName",dinasTypeName);
         stringObjectHashMap.put("dealAmount",dealAmount);
         stringObjectHashMap.put("price",price);
         stringObjectHashMap.put("amount",amount);
+        stringObjectHashMap.put("productionLineName",productionLineName);
+        stringObjectHashMap.put("purchaseSandCompanyName",purchaseSandCompanyName);
+        stringObjectHashMap.put("contractAddrReceive",contractAddrReceive);
+        stringObjectHashMap.put("stationAddress",stationAddress);
+        stringObjectHashMap.put("dealTime",dealTime);
         stringObjectHashMap.put("plateNumber",plateNumber);
         stringObjectHashMap.put("receiverName",data.getString("receiverName"));
         stringObjectHashMap.put("memo",data.getString("memo"));
         stringObjectHashMap.put("contactNumber",data.getString("contactNumber"));
         stringObjectHashMap.put("confirmTime",data.getString("confirmTime"));
-        stringObjectHashMap.put("confirmStatus",data.getString("confirmStatus"));
+        stringObjectHashMap.put("confirmStatus",data.getInt("confirmStatus"));
     }
 
 }

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$sequence.jmx

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/bcp-sequence">
 	<specification>1.0</specification>
-	<id>ed35f190-470c-41aa-a301-fff6a97d925b</id>
+	<id>2592381c-286f-44fa-8278-b66c56a14eb2</id>
 	<name>com.xyst.dinas.transport.bill.VehicleDispatch$sequence</name>
 	<title>车辆派单$sequence</title>
 	<description>车辆派单</description>