车辆派单功能提交

backend/.gitignore

@@ -13,3 +13,4 @@ target/
 *.ipr
 *.iws
 out/
+../gradle/
\ No newline at end of file

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/DinasTypeDaoImpl.java

@@ -150,9 +150,9 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
         kobject.set(BaseConstants.CREATOR, id.get(BaseConstants.CREATOR));
         kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff.getUuid("id"));
-        kobject.set("del", false);
+        kobject.set(BaseConstants.DEL, false);
         template.merge(kobject);
     }
 
@@ -165,7 +165,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
             kObject.set("station", stationDao.load(stationId));
             kObject.set("dinasType", load(dinasTypeId));
             kObject.set("id", UUID.randomUUID());
-            kObject.set("del", false);
+            kObject.set(BaseConstants.DEL, false);
             Serializable save = template.save(STATION_DINAS_TYPE_DETAIL_ENTITY, kObject);
             return null!=save.toString();
         } else if(byExample.size()==1){
@@ -173,7 +173,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
             if(!kObject.getBoolean("del")){
                 return  false;
             }
-            kObject.set("del",false);
+            kObject.set(BaseConstants.DEL,false);
             template.update(STATION_DINAS_TYPE_DETAIL_ENTITY,kObject);
             return  true;
         }
@@ -185,7 +185,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
         List<KObject> byExample = getByExample(dinasTypeId, stationId);
         if (byExample.size()>0) {
             for (KObject kObject : byExample) {
-                kObject.set("del",true);
+                kObject.set(BaseConstants.DEL,true);
                 template.update(STATION_DINAS_TYPE_DETAIL_ENTITY,kObject);
             }
             return true;
@@ -212,7 +212,7 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
         kObject.set("id", UUID.randomUUID());
         kObject.set(BaseConstants.CREATOR, staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del", false);
+        kObject.set(BaseConstants.DEL, false);
         return ((UUID) template.save(kObject));
     }
 
@@ -220,9 +220,9 @@ public class DinasTypeDaoImpl extends AbstractBaseDao implements DinasTypeDao, D
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", true);
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/ProductionLineDaoImpl.java

@@ -73,9 +73,9 @@ public class ProductionLineDaoImpl extends AbstractBaseDao implements Production
         kobject.set(BaseConstants.CREATE_TIME,id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",false);
+        kobject.set(BaseConstants.DEL,false);
         template.merge(kobject);
     }
 
@@ -90,7 +90,7 @@ public class ProductionLineDaoImpl extends AbstractBaseDao implements Production
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.set(BaseConstants.CREATOR,staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del",false);
+        kObject.set(BaseConstants.DEL,false);
         return ((UUID)template.save(kObject));
     }
 
@@ -104,9 +104,9 @@ public class ProductionLineDaoImpl extends AbstractBaseDao implements Production
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",true);
+        kobject.set(BaseConstants.DEL,true);
         template.update(kobject);
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/RetailInfoDaoImpl.java

@@ -98,9 +98,9 @@ public class RetailInfoDaoImpl extends AbstractBaseDao implements RetailInfoDao,
         kobject.set(BaseConstants.CREATE_TIME,id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",false);
+        kobject.set(BaseConstants.DEL,false);
         template.deleteAll(id.get("productionLines").toList());
         KObject productions = kobject.get("productionLines");
 
@@ -128,7 +128,7 @@ public class RetailInfoDaoImpl extends AbstractBaseDao implements RetailInfoDao,
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.set(BaseConstants.CREATOR,staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del",false);
+        kObject.set(BaseConstants.DEL,false);
         UUID save = (UUID) template.save(kObject);
         KObject productions = kObject.get("productionLines");
         if(null!=productions){
@@ -154,9 +154,9 @@ public class RetailInfoDaoImpl extends AbstractBaseDao implements RetailInfoDao,
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",true);
+        kobject.set(BaseConstants.DEL,true);
         template.update(kobject);
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/SandMiningAreaDaoImpl.java

@@ -81,8 +81,8 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
         kobject.set(BaseConstants.CREATE_TIME,id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime",new Date());
-        kobject.set("del",false);
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
+        kobject.set(BaseConstants.DEL,false);
         kobject.set(BaseConstants.MODIFIER,staff);
         template.merge(kobject);
         //生成采区预警设置信息
@@ -139,7 +139,7 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.set(BaseConstants.CREATOR,staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del",false);
+        kObject.set(BaseConstants.DEL,false);
         UUID save = (UUID) template.save(kObject);
         return save;
     }
@@ -154,9 +154,9 @@ public class SandMiningAreaDaoImpl extends AbstractBaseDao implements SandMining
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",true);
+        kobject.set(BaseConstants.DEL,true);
         template.update(kobject);
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/ShipInfoDaoImpl.java

@@ -104,10 +104,10 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
         kobject.set(BaseConstants.CREATOR, id.get(BaseConstants.CREATOR));
         kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("del", false);
+        kobject.set(BaseConstants.DEL, false);
         template.merge(kobject);
     }
 
@@ -132,7 +132,7 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
         }
         kObject.set(BaseConstants.CREATOR, staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del", false);
+        kObject.set(BaseConstants.DEL, false);
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.validate();
         return ((UUID) template.save(kObject));
@@ -142,9 +142,9 @@ public class ShipInfoDaoImpl extends AbstractBaseDao implements ShipInfoDao, Shi
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", true);
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/dao/StationDaoImpl.java

@@ -98,9 +98,9 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
         kobject.set(BaseConstants.CREATE_TIME,id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",false);
+        kobject.set(BaseConstants.DEL,false);
         template.deleteAll(id.get("productionLines").toList());
         KObject productions = kobject.get("productionLines");
 
@@ -128,7 +128,7 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.set(BaseConstants.CREATOR,staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del",false);
+        kObject.set(BaseConstants.DEL,false);
         UUID save = (UUID) template.save(kObject);
         KObject productions = kObject.get("productionLines");
         if(null!=productions){
@@ -154,9 +154,9 @@ public class StationDaoImpl  extends AbstractBaseDao implements StationDao, Stat
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(STATION, id);
-        kobject.set("modifyTime",new Date());
+        kobject.set(BaseConstants.MODIFY_TIME,new Date());
         kobject.set(BaseConstants.MODIFIER,staff);
-        kobject.set("del",true);
+        kobject.set(BaseConstants.DEL,true);
         template.update(kobject);
     }
 

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/PositionServiceImpl.java

@@ -89,7 +89,7 @@ public class PositionServiceImpl implements PositionService, PositionConstant {
 //						}
 //					}
 				}
-				kObject.set("modifyTime", new Date());
+				kObject.set(BaseConstants.MODIFY_TIME, new Date());
 				kObject.set(BaseConstants.MODIFIER, staff);
 				kObject.set("name", jsonObject.getString("name"));
 				kObject.set("description", jsonObject.isNull("description") ? "" : jsonObject.getString("description"));

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarningServiceImpl.java

@@ -186,7 +186,7 @@ public class WarningServiceImpl implements WarningService{
     @Override
     public void deleteWarnSetting(UUID warnSettingId) {
         KObject kObject = warnSettingDao.queryWarnSettingById(warnSettingId);
-        kObject.set("del",true);
+        kObject.set(BaseConstants.DEL,true);
         kObject.set("discard",true);
         warnSettingDao.update(kObject);
         //结束预警执行记录

backend/xyst.dinas.camera/src/main/java/com/xyst/dinas/camera/internal/dao/CameraInfoDaoImpl.java

@@ -103,9 +103,9 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
         kobject.set("cameraAccount",cameraAccount);
         kobject.set("regionalStation",regionalStation);
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", false);
+        kobject.set(BaseConstants.DEL, false);
         template.merge(kobject);
     }
 
@@ -121,7 +121,7 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
         object.set("regionalStation",regionalStation);
         object.set(BaseConstants.CREATOR, staff);
         object.set(BaseConstants.CREATE_TIME, new Date());
-        object.set("del", false);
+        object.set(BaseConstants.DEL, false);
         object.set("regionalCompany", regionalCompany);
         object.validate();
         return ((UUID) template.save(object));
@@ -131,9 +131,9 @@ public class CameraInfoDaoImpl extends AbstractBaseDao implements CameraInfoDao,
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", true);
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/PriceAdjustmentDaoImpl.java

@@ -152,8 +152,8 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
     @Override
     public void deleteById(UUID id) {
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime", new Date());
-        kobject.set("del", true);
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 
@@ -426,7 +426,7 @@ public class PriceAdjustmentDaoImpl extends AbstractBaseDao implements PriceAdju
         kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
         kobject.set(BaseConstants.DEL, false);
         template.merge(kobject);

backend/xyst.dinas.price/src/main/java/com/xyst/dinas/price/internal/dao/RegionalCompanyPriceAuthorityDaoImpl.java

@@ -64,9 +64,9 @@ public class RegionalCompanyPriceAuthorityDaoImpl extends AbstractBaseDao implem
         kobject.set(BaseConstants.CREATOR, id.get(BaseConstants.CREATOR));
         kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff.getUuid("id"));
-        kobject.set("del", false);
+        kobject.set(BaseConstants.DEL, false);
         template.merge(kobject);
     }
 
@@ -90,7 +90,7 @@ public class RegionalCompanyPriceAuthorityDaoImpl extends AbstractBaseDao implem
         kObject.set("id", UUID.randomUUID());
         kObject.set(BaseConstants.CREATOR, staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del", false);
+        kObject.set(BaseConstants.DEL, false);
 
         return ((UUID) template.save(kObject));
     }
@@ -99,9 +99,9 @@ public class RegionalCompanyPriceAuthorityDaoImpl extends AbstractBaseDao implem
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", true);
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 
@@ -117,7 +117,7 @@ public class RegionalCompanyPriceAuthorityDaoImpl extends AbstractBaseDao implem
             kObject.set("canLookRegionalCompany", dinasOrganizationDao.load(checkedRegionalCompanyId));
             kObject.set("id", UUID.randomUUID());
             kObject.set("createTime",new Date());
-            kObject.set("del", false);
+            kObject.set(BaseConstants.DEL, false);
             Serializable save = template.save(ENTITY, kObject);
             return null!=save.toString();
         } else if(byExample.size()==1){
@@ -125,7 +125,7 @@ public class RegionalCompanyPriceAuthorityDaoImpl extends AbstractBaseDao implem
             if(!kObject.getBoolean(BaseConstants.DEL)){
                 return  false;
             }
-            kObject.set("del",false);
+            kObject.set(BaseConstants.DEL,false);
             template.update(ENTITY,kObject);
             return  true;
         }
@@ -137,7 +137,7 @@ public class RegionalCompanyPriceAuthorityDaoImpl extends AbstractBaseDao implem
         List<KObject> byExample = getByExample(currentRegionalCompanyId, checkedRegionalCompanyId);
         if (byExample.size()>0) {
             for (KObject kObject : byExample) {
-                kObject.set("del",true);
+                kObject.set(BaseConstants.DEL,true);
                 template.update(ENTITY,kObject);
             }
             return true;

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/DischargingDaoImpl.java

@@ -196,9 +196,9 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
         kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", false);
+        kobject.set(BaseConstants.DEL, false);
         template.flush();
         template.merge(kobject);
 
@@ -291,7 +291,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.set(BaseConstants.CREATOR, staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del", false);
+        kObject.set(BaseConstants.DEL, false);
         return ((UUID) template.save(kObject));
     }
 
@@ -301,7 +301,7 @@ public class DischargingDaoImpl extends AbstractBaseDao implements DischargingDa
         KObject kobject = (KObject) template.load(ENTITY, id);
         kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", true);
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/ProductionPlanReportDaoImpl.java

@@ -7,6 +7,7 @@ import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
 import com.beecode.inz.common.BaseConstants;
+import com.beecode.inz.common.util.DateTimeUtils;
 import com.xyst.dinas.biz.dao.DinasTypeDao;
 import com.xyst.dinas.production.constant.ProductionPlanReportConstant;
 import com.xyst.dinas.production.dao.ProductionPlanReportDao;
@@ -78,8 +79,8 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
         KObject[] dinasTypeDetails;
         for (KObject kObject : list) {
             KObject clone = kObject.clone();
-            clone.setNull(BaseConstants.CREATOR);
-            clone.setNull(BaseConstants.MODIFIER);
+//            clone.setNull(BaseConstants.CREATOR);
+//            clone.setNull(BaseConstants.MODIFIER);
             clone.setNull("regionalCompany");
             KObject station = clone.get("station").clone();
             station.setNull(BaseConstants.CREATOR);
@@ -123,7 +124,7 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
         kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
         KObject staff = AminoContextHolder.getContext().getStaff();
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set("warehousingStatus", id.getBoolean("warehousingStatus"));
         kobject.set(BaseConstants.MODIFIER, staff);
         kobject.set(BaseConstants.DEL, false);
@@ -239,11 +240,10 @@ public class ProductionPlanReportDaoImpl extends AbstractBaseDao implements Prod
         DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(ENTITY);
         detachedCriteria.add(Restrictions.eq(BaseConstants.DEL, false));
         if (null==productionPlanId) {
-            detachedCriteria.add(Restrictions.le("productionPlanDate", new Date()));
+            detachedCriteria.add(Restrictions.le("productionPlanDate", DateTimeUtils.getStartDateTimeOfDay(new Date())));
         } else {
             //根据单条生产计划id查询该场站今天所有的生产计划
             List<UUID> ids= getAllByOne(productionPlanId);
-            assert ids != null;
             detachedCriteria.add(Restrictions.in("id", ids));
         }
         detachedCriteria.add(Restrictions.eq("warehousingStatus", false));

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/dao/SandMiningDaoImpl.java

@@ -83,7 +83,7 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
         kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", false);
+        kobject.set(BaseConstants.DEL, false);
 //        kobject.setNull("stationDetails");
         kobject.set("ship", template.load(ShipInfoConstant.ENTITY, kobject.get("ship").getUuid("id")));
         kobject.set("sandMiningArea", template.load(SandMiningAreaConstant.ENTITY, kobject.get("sandMiningArea").getUuid("id")));
@@ -137,7 +137,7 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
         kObject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
         kObject.set(BaseConstants.CREATOR, staff);
         kObject.set(BaseConstants.CREATE_TIME, new Date());
-        kObject.set("del", false);
+        kObject.set(BaseConstants.DEL, false);
 
         UUID save = (UUID) template.save(kObject);
 
@@ -154,9 +154,9 @@ public class SandMiningDaoImpl extends AbstractBaseDao implements SandMiningDao,
     public void deleteById(UUID id) {
         KObject staff = AminoContextHolder.getContext().getStaff();
         KObject kobject = (KObject) template.load(ENTITY, id);
-        kobject.set("modifyTime", new Date());
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
         kobject.set(BaseConstants.MODIFIER, staff);
-        kobject.set("del", true);
+        kobject.set(BaseConstants.DEL, true);
         template.update(kobject);
     }
 

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/NeedPlanConstant.java

 package com.xyst.dinas.sales.constant;
 
+import com.beecode.bcp.type.KObject;
+
+import java.util.List;
+
 public interface NeedPlanConstant {
 
 	/**
 	 * 实体名
 	 */
-	String NEED_PLAN_NTITY = "com.xyst.dinas.sales.datamodel.NeedPlan";
+	String NEED_PLAN_ENTITY = "com.xyst.dinas.sales.datamodel.NeedPlan";
 	/**
 	 * 需用计划量
 	 */
 	String needPlanAmount = "needPlanAmount";
+
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/constant/SalesPlanConstant.java

@@ -57,4 +57,6 @@ public class SalesPlanConstant {
 	
 	/** 临时销售计划主表-实体*/
 	public static final String ENTITY_TEMP = "com.xyst.dinas.sales.datamodel.SalesPlanTemp";
+	/** 临时销售计划子表-实体*/
+	public static final String ENTITY_TEMP_DETAIL = "com.xyst.dinas.sales.datamodel.SalesPlanTempAssociatedSalesPlanTempDetail";
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/NeedPlanDao.java

 package com.xyst.dinas.sales.dao;
 
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -13,4 +14,14 @@ public interface NeedPlanDao {
 
 	List<UUID> queryNeedPlanContratByCycleId(UUID planningCycleId);
 
+    /**
+     * 获取今天所在计划周期下的需用计划中的所有购砂单位
+     * @return
+     * @param date
+     */
+    List<KObject> getSandUnitByNowPlanningCycle(Date date);
+
+    List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date);
+
+    List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId);
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java

 package com.xyst.dinas.sales.dao;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
+import com.beecode.amino.core.Amino;
+import com.beecode.bcp.type.KClass;
+import com.beecode.inz.common.BaseConstants;
+import com.xyst.dinas.biz.dao.DinasTypeDao;
+import com.xyst.dinas.sales.enumeration.TransportModeEnum;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
 import org.hibernate.query.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.lang.Nullable;
@@ -17,6 +27,8 @@ public class SalesPlanDao {
 
 	@Autowired
 	private HibernateTemplate template;
+	@Autowired
+	private DinasTypeDao dinasTypeDao;
 
 	
 	public void update(KObject kobject) {
@@ -176,4 +188,104 @@ public class SalesPlanDao {
 			
 		});
 	}
+
+
+    public List<KObject> getDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId) {
+
+        KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_DETAIL, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        detachedCriteria.createAlias("master", "master");
+        detachedCriteria.add(Restrictions.eq("purchaseSandUnit.id", purchaseSandUnitId));
+        detachedCriteria.add(Restrictions.eq("master.planningCycle.id", planningCycleId));
+        detachedCriteria.add(Restrictions.eq("project.id", projectId));
+        return (List<KObject>) template.findByCriteria(detachedCriteria);
+    }
+
+    /**
+     * 查询已经审批通过的时间内的砂石类型
+     *
+     * @param date
+     * @return
+     */
+    public List<KObject> getSaleTempSandUnitByNowPlanningCycle(Date date) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_TEMP, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.createAlias("planningCycle", "planningCycle");
+        detachedCriteria.createAlias("contract", "contract");
+        detachedCriteria.add(Restrictions.le("planningCycle.startTime", date));
+        detachedCriteria.add(Restrictions.gt("planningCycle.endTime", date));
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, 1));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
+        detachedCriteria.setProjection(Projections.distinct(Projections.property("contract.purchaseSandUnit")));
+        return (List<KObject>) template.findByCriteria(detachedCriteria);
+    }
+
+    public List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_TEMP, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.createAlias("planningCycle", "planningCycle");
+        detachedCriteria.createAlias("contract", "contract");
+        detachedCriteria.add(Restrictions.le("planningCycle.startTime", date));
+        detachedCriteria.add(Restrictions.gt("planningCycle.endTime", date));
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, 1));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
+        detachedCriteria.add(Restrictions.eq("contract.purchaseSandUnit.id", purchaseSandUnitId));
+        detachedCriteria.setProjection(Projections.distinct(Projections.property("planningCycle")));
+        return (List<KObject>) template.findByCriteria(detachedCriteria);
+    }
+
+    public List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_TEMP, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.createAlias("planningCycle", "planningCycle");
+        detachedCriteria.createAlias("contract", "contract");
+        detachedCriteria.add(Restrictions.eq(SalesPlanConstant.APPROVE_STATE, 1));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
+        detachedCriteria.add(Restrictions.eq("contract.purchaseSandUnit.id", purchaseSandUnitId));
+        detachedCriteria.add(Restrictions.eq("planningCycle.id", planningCycleId));
+        detachedCriteria.setProjection(Projections.distinct(Projections.property("project")));
+        return (List<KObject>) template.findByCriteria(detachedCriteria);
+    }
+
+
+    public List<KObject> getSealTempDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId) {
+
+        ArrayList<KObject> kObjects1 = new ArrayList<>();
+        KClass bean1 = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_DETAIL, KClass.class);
+
+        KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_TEMP, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        detachedCriteria.createAlias("contract", "contract");
+        detachedCriteria.add(Restrictions.eq("contract.purchaseSandUnit.id", purchaseSandUnitId));
+        detachedCriteria.add(Restrictions.eq("planningCycle.id", planningCycleId));
+        detachedCriteria.add(Restrictions.eq("project.id", projectId));
+        List<KObject> byCriteria = (List<KObject>) template.findByCriteria(detachedCriteria);
+        for (KObject byCriterion : byCriteria) {
+            KObject salesPlanTempDetails = byCriterion.get("SalesPlanTempDetails");
+            if (null != salesPlanTempDetails) {
+                KObject[] kObjects = salesPlanTempDetails.toArray();
+                for (KObject detail : kObjects) {
+                    KObject kObject1 = bean1.newInstance();
+                    KObject clone1 = detail.clone();
+                    KObject dinasType = clone1.get(SalesPlanConstant.dinasType).clone();
+                    dinasType.set(SalesPlanConstant.dinasTypeName,
+                            dinasType.getString(SalesPlanConstant.dinasTypeName)
+                                    + byCriterion.get(SalesPlanConstant.contract).getString(SalesPlanConstant.contractName)
+                                    + DateFormatUtils.format(byCriterion.getDate(BaseConstants.CREATE_TIME), "yy/MM/dd HH:mm:ss") + "提交");
+                    kObject1.set(SalesPlanConstant.dinasType, dinasType);
+                    kObject1.set(BaseConstants.ID, clone1.getUuid(BaseConstants.ID));
+                    kObject1.set(SalesPlanConstant.planAmount, clone1.get(SalesPlanConstant.actualSaleAmount));
+                    kObject1.set(SalesPlanConstant.contract,byCriterion.get(SalesPlanConstant.contract));
+                    kObject1.set(SalesPlanConstant.station,byCriterion.get(SalesPlanConstant.station));
+                    kObjects1.add(kObject1);
+                }
+            }
+        }
+        return kObjects1;
+    }
+
 }
+

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/enumeration/transportModeEnum.java

@@ -5,7 +5,7 @@ package com.xyst.dinas.sales.enumeration;
  * @author Jackpot
  * @date 2021年4月14日
  */
-public enum transportModeEnum {
+public enum TransportModeEnum {
 
 	/**
 	 * 自提
@@ -18,7 +18,7 @@ public enum transportModeEnum {
 	;
 	int value;
 
-	transportModeEnum(int value) {
+	TransportModeEnum(int value) {
 		this.value = value;
 	}
 

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/NeedPlanDaoImpl.java

 package com.xyst.dinas.sales.internal.dao;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 import javax.persistence.Tuple;
 
+import com.beecode.amino.core.Amino;
+import com.beecode.bcp.type.KClass;
+import com.xyst.dinas.biz.dao.DinasTypeDao;
+import com.xyst.dinas.biz.enumeration.SubmitStateEnum;
+import com.xyst.dinas.sales.enumeration.TransportModeEnum;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
+import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Projections;
+import org.hibernate.criterion.Restrictions;
 import org.hibernate.query.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.orm.hibernate5.HibernateCallback;
@@ -24,12 +29,15 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
 	@Autowired
 	private HibernateOperations template;
 
+	@Autowired
+	private DinasTypeDao dinasTypeDao;
+
 	@Override
 	public KObject queryNeedPlanByContractIdAndCycleId(UUID planningCycleId, UUID contractId) {
 		return (KObject)template.execute(new HibernateCallback<KObject>() {
 			@Override
 			public KObject doInHibernate(Session session) throws HibernateException {
-				Query<KObject> query = session.createQuery("from " + NEED_PLAN_NTITY + " where planningCycle.id=:planningCycleId and contract.id=:contractId and submitState=:submitState", KObject.class);
+				Query<KObject> query = session.createQuery("from " + NEED_PLAN_ENTITY + " where planningCycle.id=:planningCycleId and contract.id=:contractId and submitState=:submitState", KObject.class);
 				query.setParameter("planningCycleId", planningCycleId);
 				query.setParameter("contractId", contractId);
 				query.setParameter("submitState", "SUBMITTED");
@@ -45,7 +53,7 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
 		return (List<KObject>)template.execute(new HibernateCallback<List<KObject>>() {
 			@Override
 			public List<KObject> doInHibernate(Session session) throws HibernateException {
-				Query<KObject> query = session.createQuery("from " + NEED_PLAN_NTITY + " where contract.id=:contractId and submitState=:submitState", KObject.class);
+				Query<KObject> query = session.createQuery("from " + NEED_PLAN_ENTITY + " where contract.id=:contractId and submitState=:submitState", KObject.class);
 				query.setParameter("contractId", contractId);
 				query.setParameter("submitState", "SUBMITTED");
 				List<KObject> resultList = query.getResultList();
@@ -73,6 +81,63 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
 			}
 		});
 	}
-	
-	
+
+    /**
+     * 获取今天所在计划周期下的需用计划中配送方式为配送 已提交的的所有购砂单位
+     * @return
+     * @param date
+     */
+    @Override
+    public List<KObject> getSandUnitByNowPlanningCycle(Date date) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(NEED_PLAN_ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.createAlias("planningCycle","planningCycle");
+        detachedCriteria.add(Restrictions.le("planningCycle.startTime",date));
+        detachedCriteria.add(Restrictions.gt("planningCycle.endTime",date));
+        detachedCriteria.add(Restrictions.eq("submitState", SubmitStateEnum.SUBMITTED.name()));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
+        detachedCriteria.setProjection(Projections.distinct(Projections.property("purchaseSandUnit")));
+        return  (List<KObject>)template.findByCriteria(detachedCriteria);
+    }
+
+
+    /**
+     * 获取今天所在计划周期下的需用计划中配送方式为配送 已提交的 某个单位的 的所有计划周期
+     * @param purchaseSandUnitId 运砂单位id
+     * @param date
+     * @return
+     */
+    @Override
+    public List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(NEED_PLAN_ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.createAlias("planningCycle","planningCycle");
+        detachedCriteria.add(Restrictions.le("planningCycle.startTime",date));
+        detachedCriteria.add(Restrictions.gt("planningCycle.endTime",date));
+        detachedCriteria.add(Restrictions.eq("submitState", SubmitStateEnum.SUBMITTED.name()));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
+        detachedCriteria.add(Restrictions.eq("purchaseSandUnit.id", purchaseSandUnitId));
+        detachedCriteria.setProjection(Projections.distinct(Projections.property("planningCycle")));
+        return  (List<KObject>)template.findByCriteria(detachedCriteria);
+    }
+    /**
+     * 根据运砂单位和计划周期获取 项目
+     * @return
+     */
+    @Override
+    public List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId) {
+        KClass bean = Amino.getStaticMetadataContext().getBean(NEED_PLAN_ENTITY, KClass.class);
+        DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
+        dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
+        detachedCriteria.add(Restrictions.eq("submitState", SubmitStateEnum.SUBMITTED.name()));
+        detachedCriteria.add(Restrictions.eq("transportMode", TransportModeEnum.DELIVERY.name()));
+        detachedCriteria.add(Restrictions.eq("purchaseSandUnit.id", purchaseSandUnitId));
+        detachedCriteria.add(Restrictions.eq("planningCycle.id", planningCycleId));
+        detachedCriteria.setProjection(Projections.distinct(Projections.property("project")));
+        return  (List<KObject>)template.findByCriteria(detachedCriteria);
+    }
+
+
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/NeedPlanServiceImpl.java

 package com.xyst.dinas.sales.internal.service;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -87,4 +83,24 @@ public class NeedPlanServiceImpl implements NeedPlanService {
 		return result;
 	}
 
+    /**
+     * 获取今天所在计划周期下的需用计划中的所有购砂单位
+     * @return
+     * @param date
+     */
+    @Override
+    public List<KObject> getSandUnitByNowPlanningCycle(Date date) {
+        return needPlanDao.getSandUnitByNowPlanningCycle(date);
+    }
+
+    @Override
+    public List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date){
+        return needPlanDao.getPlanningCycleByNowPlanningCycleAndSandUnitId(purchaseSandUnitId,date);
+    }
+
+    @Override
+    public List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId){
+        return needPlanDao.getProjectByNowPlanningCycle(purchaseSandUnitId,planningCycleId);
+
+    }
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java

@@ -59,7 +59,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 	
 	@Autowired
 	private PlanningCycleService planningCycleService;
-	
+
 	@Autowired
 	private StaffService staffService;
 	
@@ -249,7 +249,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 	public List<Map<String, Object>> modify(JSONObject jsonObject) {
 		UUID salesPlanId = UUID.fromString(jsonObject.getString("id"));
 		KObject kObject = salesPlanDao.load(salesPlanId);
-		kObject.set("modifyTime", new Date());
+		kObject.set(BaseConstants.MODIFY_TIME, new Date());
 		
 		kObject.set("modifier",  AminoContextHolder.getContext().getStaff());
 		//kObject.set("requiredTotalAmount", jsonObject.getBigDecimal("requiredTotalAmount"));
@@ -406,7 +406,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 		} else {
 			return ResponseObj.success(null);
 		}
-		
+
 	}
 
 	public List<Map<String, Object>> verifyTempSalesPlan(JSONObject jsonObject) {
@@ -415,7 +415,7 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 		KObject planningCycle = planningCycleService.load(planningCycleId); //计划周期
 		Date startTime = planningCycle.getDate(PlanningCycleConstant.startTime);
 		Date endTime = planningCycle.getDate(PlanningCycleConstant.endTime);
-		
+
 		UUID contractId = UUID.fromString(jsonObject.getJSONObject("contract").getString("id"));
 		//根据开始时间和结束时间查询临时销售计划
 		List<KObject> salesTempPlanByTimeList = salesPlanDao.querySalesTempPlanByTime(startTime, endTime, contractId);
@@ -475,4 +475,62 @@ public class SalesPlanServiceImpl implements SalesPlanService{
 	
 	
 	
+    /**
+     * 根据需用计划中查询出的条件查询对应销售计划中拥有的砂石类型
+     *
+     * @param purchaseSandUnitId 运砂单位id
+     * @param planningCycleId 计划周期id
+     * @param projectId 项目id
+     * @return
+     */
+    @Override
+    public List<KObject> getDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId) {
+        return salesPlanDao.getDinasTypeListByNeedPlanInfo(purchaseSandUnitId,planningCycleId,projectId);
+    }
+
+    /**
+     * 查询今天提交并审批通过的所有临时销售计划中的购砂单位
+     * @param date
+     * @return
+     */
+    @Override
+    public List<KObject> getSaleTempSandUnitByNowPlanningCycle(Date date) {
+        return salesPlanDao.getSaleTempSandUnitByNowPlanningCycle(date);
+    }
+
+    /**
+     * 根据购砂公司获取所有计划
+     *
+     * @param purchaseSandUnitId
+     * @param date
+     * @return
+     */
+    @Override
+    public List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date) {
+        return salesPlanDao.getPlanningCycleByNowPlanningCycleAndSandUnitId(purchaseSandUnitId,date);
+    }
+
+    /**
+     * 根据购砂公司和计划获取所有项目
+     * @param purchaseSandUnitId
+     * @param planningCycleId
+     * @return
+     */
+    @Override
+    public List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId) {
+        return salesPlanDao.getProjectByNowPlanningCycle(purchaseSandUnitId,planningCycleId);
+    }
+
+    /**
+     * 根据购砂公司和计划和项目获取所有的砂石类型
+     * @param purchaseSandUnitId
+     * @param planningCycleId
+     * @return
+     */
+    @Override
+    public List<KObject> getSealTempDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId) {
+        return salesPlanDao.getSealTempDinasTypeListByNeedPlanInfo(purchaseSandUnitId,planningCycleId,projectId);
+    }
+
+
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/NeedPlanService.java

 package com.xyst.dinas.sales.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
@@ -15,4 +16,14 @@ public interface NeedPlanService {
 	
 	List<ContractExecuteDetail> queryContractExecuteDetailByContractId(UUID contractId);
 
+    /**
+     * 获取今天所在计划周期下的需用计划中的所有购砂单位
+     * @return
+     * @param date
+     */
+    List<KObject> getSandUnitByNowPlanningCycle(Date date);
+
+    List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date);
+
+    List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId);
 }

backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java

 package com.xyst.dinas.sales.service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
@@ -58,5 +59,33 @@ public interface SalesPlanService {
 	public Object submitSalesPlan(UUID jsonObject);
 
 	public Object submitTempSalesPlan(JSONObject jsonObject);
-	
+
+    /**
+     * 根据需用计划中查询出的条件查询对应销售计划中拥有的砂石类型
+     * @param purchaseSandUnitId
+     * @param planningCycleId
+     * @param projectId
+     * @return
+     */
+    List<KObject> getDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId);
+
+    /**
+     * 获取今日所有审批通过的购砂公司
+     * @param date
+     * @return
+     */
+    List<KObject> getSaleTempSandUnitByNowPlanningCycle(Date date);
+
+    /**
+     * 根据购砂公司获取所有计划
+     *
+     * @param purchaseSandUnitId
+     * @param date
+     * @return
+     */
+    List<KObject> getPlanningCycleByNowPlanningCycleAndSandUnitId(UUID purchaseSandUnitId, Date date);
+
+    List<KObject> getProjectByNowPlanningCycle(UUID purchaseSandUnitId, UUID planningCycleId);
+
+    List<KObject> getSealTempDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId);
 }

backend/xyst.dinas.transport/build.gradle

@@ -20,8 +20,7 @@ dependencies {
     compile project(":inz.basis")
     compile project(":inz.authentication")
     compile project(":xyst.dinas.biz")
-    compile project(":xyst.dinas.production")
-    compile project(":xyst.dinas.project")
+    compile project(":xyst.dinas.sales")
 
 
     testCompile lib.amino_boot_web

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/config/VehicleDispatchConfiguration.java

+package com.xyst.dinas.transport.config;
+
+import com.xyst.dinas.transport.dao.VehicleDispatchDao;
+import com.xyst.dinas.transport.internal.dao.VehicleDispatchDaoImpl;
+import com.xyst.dinas.transport.internal.service.VehicleDispatchServiceImpl;
+import com.xyst.dinas.transport.service.VehicleDispatchService;
+import com.xyst.dinas.transport.web.VehicleDispatchController;
+import org.springframework.context.annotation.Bean;
+
+public class VehicleDispatchConfiguration {
+
+	@Bean
+
+	public VehicleDispatchController vehicleDispatchController() {
+		return new VehicleDispatchController();
+	}
+	
+	@Bean
+	public VehicleDispatchService vehicleDispatchService() {
+		return new VehicleDispatchServiceImpl();
+	}
+	
+	@Bean
+	public VehicleDispatchDao vehicleDispatchDao() {
+		return new VehicleDispatchDaoImpl();
+	}
+}

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/constant/VehicleDispatchConstant.java

+package com.xyst.dinas.transport.constant;
+
+/**
+ * @author scol
+ */
+public interface VehicleDispatchConstant {
+
+	/** 派单-实体*/
+	 String ENTITY = "com.xyst.dinas.transport.datamodel.VehicleDispatch";
+	/** 销售计划主表-实体*/
+	 String SALES_PLAN_ENTITY = "com.xyst.dinas.sales.datamodel.SalesPlan";
+	/** 销售计划子表-实体*/
+	 String SALES_PLAN_ENTITY_DETAIL = "com.xyst.dinas.sales.datamodel.SalesPlanAssociatedSalesPlanDetail";
+	/** 销售计划子表-名称*/
+	 String SALES_PLAN_DETAILS = "SalesPlanDetails";
+	
+	/** 计划周期*/
+	 String PLANNING_CYCLE = "planningCycle";
+	/** 审批状态*/
+	 String APPROVE_STATE = "approveState";
+	/** 审批时间*/
+	 String APPROVE_TIME = "approveTime";
+	/** 审批备注*/
+	 String APPROVE_MEMO = "approveMemo";
+	
+	
+	/** 合同*/
+	 String CONTRACT = "contract";
+	/** 合同名称*/
+	 String CONTRACT_NAME = "contractName";
+	/** 项目*/
+	 String PROJECT = "project";
+	/** 购砂单位*/
+	 String PURCHASE_SAND_UNIT = "purchaseSandUnit";
+	/** 砂石种类*/
+	 String DINAS_TYPE = "dinasType";
+	/** 场站*/
+	 String STATION = "station";
+    /** 需用量*/
+	 String REQUIRED_AMOUNT = "requiredAmount";
+	/** 合同砂石余量*/
+	 String CONTRACT_AMOUNT = "contractAmount";
+	/** 本期分配量*/
+	 String PLAN_AMOUNT = "planAmount";
+	/** 库存量*/
+	 String STOCK_AMOUNT = "stockAmount";
+	/** 实际销售量*/
+	 String ACTUAL_SALE_AMOUNT = "actualSaleAmount";
+
+	/** 项目名称*/
+	 String PROJECT_NAME = "projectName";
+	/** 项目类型名称*/
+	 String PROJECT_TYPE_NAME = "projectTypeName";
+	/** 购砂单位名称*/
+	 String PURCHASE_SAND_UNIT_NAME = "purchaseSandUnitName";
+	/** 砂石类型名称*/
+	 String DINAS_TYPE_NAME = "dinasTypeName";
+
+
+}

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/dao/VehicleDispatchDao.java

+package com.xyst.dinas.transport.dao;
+
+import com.beecode.bcp.type.KObject;
+import com.beecode.inz.basis.dao.BaseDao;
+
+import java.util.UUID;
+
+public interface VehicleDispatchDao extends BaseDao {
+
+    UUID create(KObject kobject);
+
+    UUID merge(KObject kobject);
+    KObject load(UUID id);
+}

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/enumeration/DispatchTypeEnum.java

+package com.xyst.dinas.transport.enumeration;
+
+public enum DispatchTypeEnum {
+    /**
+     * 需用计划
+     *
+     */
+
+    NEED_PLAN(0),
+
+    /**
+     * 临时销售计划
+     */
+    SALE_TEMP_PLAN(1);
+    int value;
+    DispatchTypeEnum(int value) {
+        this.value = value;
+    }
+
+    public int getValue() {
+        return value;
+    }
+}

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

+package com.xyst.dinas.transport.internal.dao;
+
+import com.beecode.bcp.core.context.AminoContextHolder;
+import com.beecode.bcp.type.KObject;
+import com.beecode.inz.basis.internal.dao.AbstractBaseDao;
+import com.beecode.inz.common.BaseConstants;
+import com.xyst.dinas.transport.constant.VehicleDispatchConstant;
+import com.xyst.dinas.transport.dao.VehicleDispatchDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.hibernate5.HibernateTemplate;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author scol
+ */
+public class VehicleDispatchDaoImpl extends AbstractBaseDao implements VehicleDispatchDao, VehicleDispatchConstant {
+
+    @Autowired
+    private HibernateTemplate template;
+
+
+    /**
+     * 抽象方法，需要实现类提供HibernateTemplate
+     *
+     * @return
+     */
+    @Override
+    protected HibernateTemplate getHibernateTemplate() {
+        return template;
+    }
+
+    /**
+     * 抽象方法，需要实现类提供当前ModelName
+     *
+     * @return
+     */
+    @Override
+    protected String getModelName() {
+        return ENTITY;
+    }
+
+    @Override
+    public UUID create(KObject kobject) {
+        KObject staff = AminoContextHolder.getContext().getStaff();
+
+        kobject.set(BaseConstants.ID, UUID.randomUUID());
+        kobject.set(BaseConstants.CREATOR, staff);
+        kobject.set(BaseConstants.CREATE_TIME, new Date());
+        kobject.set(BaseConstants.DEL, false);
+        kobject.set(BaseConstants.DISCARD, false);
+        return (UUID) template.save(kobject);
+    }
+
+    @Override
+    public UUID merge(KObject kobject) {
+        KObject id = load(kobject.getUuid(BaseConstants.ID));
+        kobject.set(BaseConstants.CREATOR, id.get(BaseConstants.CREATOR));
+        kobject.set(BaseConstants.CREATE_TIME, id.getDate(BaseConstants.CREATE_TIME));
+        KObject staff = AminoContextHolder.getContext().getStaff();
+        kobject.set(BaseConstants.MODIFY_TIME, new Date());
+        kobject.set(BaseConstants.MODIFIER, staff.getUuid(BaseConstants.ID));
+        kobject.set(BaseConstants.DEL, false);
+        kobject.set(BaseConstants.DISCARD, false);
+        template.merge(kobject);
+        return kobject.getUuid(BaseConstants.ID);
+    }
+
+
+    @Override
+    public KObject load(UUID id) {
+        return (KObject) template.load(ENTITY, id);
+    }
+}

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

+package com.xyst.dinas.transport.internal.service;
+
+import com.beecode.bap.staff.service.StaffService;
+import com.beecode.bcp.type.KObject;
+import com.beecode.inz.common.BaseConstants;
+import com.xyst.dinas.biz.dao.DinasTypeDao;
+import com.xyst.dinas.sales.constant.SalesPlanConstant;
+import com.xyst.dinas.sales.dao.SalesPlanDao;
+import com.xyst.dinas.sales.service.NeedPlanService;
+import com.xyst.dinas.transport.constant.VehicleDispatchConstant;
+import com.xyst.dinas.transport.dao.VehicleDispatchDao;
+import com.xyst.dinas.transport.enumeration.DispatchTypeEnum;
+import com.xyst.dinas.transport.service.VehicleDispatchService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+
+import javax.transaction.Transactional;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 销售计划
+ *
+ * @author scol
+ * @date 2021年4月33日
+ */
+@Transactional
+public class VehicleDispatchServiceImpl implements VehicleDispatchService {
+
+    @Autowired
+    private SalesPlanDao salesPlanDao;
+    @Autowired
+    private NeedPlanService needPlanService;
+    @Autowired
+    private StaffService staffService;
+    @Autowired
+    private VehicleDispatchDao vehicleDispatchDao;
+    @Autowired
+    private DinasTypeDao dinasTypeDao;
+
+    @Override
+    public UUID create(KObject kobject) {
+        int dispatchType = kobject.getInt("dispatchType");
+        UUID sealDetailId = kobject.getUuid("sealDetailId");
+        setInfo(kobject, dispatchType, sealDetailId);
+        if (null == kobject.getUuid("id")) {
+            kobject.set("id", UUID.randomUUID());
+        }
+        kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
+        return vehicleDispatchDao.create(kobject);
+    }
+
+    @Override
+    public UUID update(KObject kobject) {
+        int dispatchType = kobject.getInt("dispatchType");
+        UUID sealDetailId = kobject.getUuid("sealDetailId");
+        KObject load = null;
+        if (dispatchType == DispatchTypeEnum.NEED_PLAN.getValue()) {
+            load = vehicleDispatchDao.load(SalesPlanConstant.ENTITY_DETAIL, sealDetailId);
+        }
+        assert load != null;
+
+        setInfo(kobject, dispatchType, sealDetailId);
+        kobject.set("regionalCompany", dinasTypeDao.getCurrentLoginRegionalCompany());
+        return vehicleDispatchDao.merge(kobject);
+    }
+
+    private void setInfo(KObject kobject, int dispatchType, UUID sealDetailId) {
+        KObject load;
+        if (dispatchType == DispatchTypeEnum.NEED_PLAN.getValue()) {
+            load = vehicleDispatchDao.load(SalesPlanConstant.ENTITY_DETAIL, sealDetailId);
+            kobject.set(VehicleDispatchConstant.PURCHASE_SAND_UNIT, load.get(VehicleDispatchConstant.PURCHASE_SAND_UNIT));
+            kobject.set(VehicleDispatchConstant.PLANNING_CYCLE, load.get(BaseConstants.MASTER).get(VehicleDispatchConstant.PLANNING_CYCLE));
+            kobject.set(VehicleDispatchConstant.PROJECT, load.get(VehicleDispatchConstant.PROJECT));
+            kobject.set(VehicleDispatchConstant.CONTRACT, load.get(VehicleDispatchConstant.CONTRACT));
+            kobject.set(VehicleDispatchConstant.DINAS_TYPE, load.get(VehicleDispatchConstant.DINAS_TYPE));
+            kobject.set(VehicleDispatchConstant.STATION, load.get(VehicleDispatchConstant.STATION));
+            kobject.set(VehicleDispatchConstant.PLAN_AMOUNT, load.getBigDecimal(VehicleDispatchConstant.PLAN_AMOUNT));
+        } else {
+            load = vehicleDispatchDao.load(SalesPlanConstant.ENTITY_TEMP_DETAIL, sealDetailId);
+            kobject.set(VehicleDispatchConstant.PURCHASE_SAND_UNIT, load.get(BaseConstants.MASTER).get(VehicleDispatchConstant.CONTRACT).get(VehicleDispatchConstant.PURCHASE_SAND_UNIT));
+            kobject.set(VehicleDispatchConstant.PLANNING_CYCLE, load.get(BaseConstants.MASTER).get(VehicleDispatchConstant.PLANNING_CYCLE));
+            kobject.set(VehicleDispatchConstant.PROJECT, load.get(BaseConstants.MASTER).get(VehicleDispatchConstant.PROJECT));
+            kobject.set(VehicleDispatchConstant.CONTRACT, load.get(BaseConstants.MASTER).get(VehicleDispatchConstant.CONTRACT));
+            kobject.set(VehicleDispatchConstant.DINAS_TYPE, load.get(VehicleDispatchConstant.DINAS_TYPE));
+            kobject.set(VehicleDispatchConstant.STATION, load.get(BaseConstants.MASTER).get(VehicleDispatchConstant.STATION));
+            kobject.set(VehicleDispatchConstant.PLAN_AMOUNT, load.getBigDecimal("actualSaleAmount"));
+        }
+        kobject.set("transportVehicle", vehicleDispatchDao.load("com.xyst.dinas.transport.datamodel.TransportVehicle", kobject.get("transportVehicle").getUuid("id")));
+        kobject.set("transportCompany", vehicleDispatchDao.load("com.xyst.dinas.transport.datamodel.TransportCompany", kobject.get("transportCompany").getUuid("id")));
+
+    }
+
+    @Override
+    public KObject validateBySaleDetailId(Integer type, UUID id, UUID detailId) {
+        HashMap<String, Object> stringObjectHashMap = new HashMap<>();
+        stringObjectHashMap.put("dispatchType", type);
+
+        stringObjectHashMap.put(BaseConstants.DEL, false);
+        stringObjectHashMap.put("sealDetailId", detailId);
+
+        if (null != id) {
+            stringObjectHashMap.put(BaseConstants.ID, id);
+        }
+
+        List<KObject> kObjects = vehicleDispatchDao.listByAttributes(stringObjectHashMap);
+        if (CollectionUtils.isEmpty(kObjects)) {
+            return null;
+        } else {
+            if (null == id) {
+                return kObjects.get(0);
+            }
+            if (kObjects.size() > 1) {
+                return kObjects.get(0);
+            } else {
+                if (kObjects.get(0).getUuid("id").toString().equals(id.toString())) {
+                    return null;
+                } else {
+                    return kObjects.get(0);
+                }
+            }
+        }
+    }
+}

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/service/VehicleDispatchService.java

+package com.xyst.dinas.transport.service;
+
+import com.beecode.bcp.type.KObject;
+import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
+import org.json.JSONObject;
+import org.springframework.lang.Nullable;
+
+import java.util.UUID;
+
+public interface VehicleDispatchService {
+
+
+    UUID create(KObject kobject);
+
+    UUID update(KObject kobject);
+
+    KObject validateBySaleDetailId(Integer type, UUID id, UUID detailId);
+
+}

backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/VehicleDispatchController.java

+package com.xyst.dinas.transport.web;
+
+import com.beecode.amino.core.Amino;
+import com.beecode.bap.workflow.core.BizProcessState;
+import com.beecode.bcp.type.KClass;
+import com.beecode.bcp.type.KObject;
+import com.beecode.bcp.type.json.JSONObjectUtils;
+import com.beecode.inz.basis.pojo.WarehouseUser;
+import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.beecode.inz.basis.util.JsonUtil;
+import com.beecode.inz.common.BaseConstants;
+import com.beecode.nlib.utils.StringUtils;
+import com.beecode.xlib.runtime.Assert;
+import com.beecode.xlib.utils.StringUtil;
+import com.xyst.dinas.biz.constant.DinasTypeConstant;
+import com.xyst.dinas.biz.constant.PlanningCycleConstant;
+import com.xyst.dinas.biz.service.PlanningCycleService;
+import com.xyst.dinas.sales.constant.SalesPlanConstant;
+import com.xyst.dinas.sales.service.NeedPlanService;
+import com.xyst.dinas.sales.service.SalesPlanService;
+import com.xyst.dinas.sales.web.request.SaleaPlanApprove;
+import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
+import com.xyst.dinas.transport.constant.VehicleDispatchConstant;
+import com.xyst.dinas.transport.service.VehicleDispatchService;
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("transport/dispatch")
+public class VehicleDispatchController {
+	
+	@Autowired
+	private SalesPlanService salesPlanService;
+	@Autowired
+	private NeedPlanService needPlanService;
+
+	@Autowired
+	private VehicleDispatchService vehicleDispatchService;
+
+	@Autowired
+	private PlanningCycleService planningCycleService;
+
+
+    /**
+     * 查询本周期中运输方式为配送的需用计划下的所有购砂单位
+     * @param
+     * @return
+     */
+    @GetMapping("/getSandUnit")
+    public Object getSandUnitByNowPlanningCycle(@RequestParam(name = "date",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date,@RequestParam(value = "type",defaultValue = "0" ,required = false) Integer type) {
+        List<KObject> sandUnitByNowPlanningCycle =null;
+        if(null==date){
+            date=new Date();
+        }
+        if(type==0){
+            sandUnitByNowPlanningCycle = needPlanService.getSandUnitByNowPlanningCycle(date);
+        }else if(type==1){
+            sandUnitByNowPlanningCycle= salesPlanService.getSaleTempSandUnitByNowPlanningCycle(date);
+        }
+        return ResponseObj.success("查询成功",sandUnitByNowPlanningCycle);
+    }
+
+    @GetMapping("/getPlanningCycleBySandUnit")
+    public Object getPlanningCycleByNowPlanningCycleAndSandUnitId(@RequestParam(name = "date",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")Date date,@RequestParam("purchaseSandUnitId")UUID purchaseSandUnitId,@RequestParam(value = "type",defaultValue = "0" ,required = false) Integer type){
+        if(null==date){
+            date=new Date();
+        }
+        List<KObject> planningCycleByNowPlanningCycleAndSandUnitId = null;
+        if(type==0){
+            planningCycleByNowPlanningCycleAndSandUnitId = needPlanService.getPlanningCycleByNowPlanningCycleAndSandUnitId(purchaseSandUnitId, date);
+        }else if(type==1){
+            planningCycleByNowPlanningCycleAndSandUnitId= salesPlanService.getPlanningCycleByNowPlanningCycleAndSandUnitId(purchaseSandUnitId,date);
+        }
+        return ResponseObj.success("查询成功",planningCycleByNowPlanningCycleAndSandUnitId);
+    }
+
+    @GetMapping("/getProjectBySandUnitAndPlanningCycle")
+    public Object getProjectByNowPlanningCycle(@RequestParam("purchaseSandUnitId") UUID purchaseSandUnitId,@RequestParam("planningCycleId") UUID planningCycleId,@RequestParam(value = "type",defaultValue = "0" ,required = false) Integer type){
+
+        List<KObject> planningCycleByNowPlanningCycleAndSandUnitId = null;
+        if(type==0){
+            planningCycleByNowPlanningCycleAndSandUnitId = needPlanService.getProjectByNowPlanningCycle(purchaseSandUnitId,planningCycleId);
+        }else if(type==1){
+            planningCycleByNowPlanningCycleAndSandUnitId= salesPlanService.getProjectByNowPlanningCycle(purchaseSandUnitId,planningCycleId);
+        }
+        return ResponseObj.success("查询成功",planningCycleByNowPlanningCycleAndSandUnitId);
+    }
+
+
+    @GetMapping("/getDinasTypeListByNeedPlanInfo")
+    public Object getDinasTypeListByNeedPlanInfo(@RequestParam("purchaseSandUnitId") UUID purchaseSandUnitId,@RequestParam("planningCycleId")  UUID planningCycleId, @RequestParam("projectId") UUID projectId,@RequestParam(value = "type",defaultValue = "0" ,required = false) Integer type){
+        List<KObject> dinasTypes = salesPlanService.getDinasTypeListByNeedPlanInfo(purchaseSandUnitId,planningCycleId,projectId);
+
+        if(type==1){
+            dinasTypes=salesPlanService.getSealTempDinasTypeListByNeedPlanInfo(purchaseSandUnitId,planningCycleId,projectId);
+        }
+        return ResponseObj.success("查询成功",dinasTypes);
+    }
+
+    /**
+     * 创建派单信息
+     * @param body
+     * @return
+     */
+    @PostMapping()
+    public Object create(@RequestBody String body) {
+        if(StringUtil.isEmpty(body)) {
+            return ResponseObj.error("参数不能为空");
+        }
+        KObject kobject = JSONObjectUtils.toObject(body, Amino.getApplicationMetadataContext().getBean(VehicleDispatchConstant.ENTITY, KClass.class));
+        if(kobject == null) {
+            return ResponseObj.error("参数无法识别");
+        }
+
+            UUID id = vehicleDispatchService.create(kobject);
+        return ResponseObj.success("操作成功",id);
+    }
+
+
+    /**
+     * 修改砂石种类
+     * @param body 砂石种类json
+     * @return
+     */
+    @PutMapping
+    public ResponseObj update(@RequestBody String body){
+        KObject kobject = JSONObjectUtils.toObject(body,Amino.getApplicationMetadataContext().getBean(VehicleDispatchConstant.ENTITY, KClass.class));
+        if(kobject.getUuid("id") == null){
+            return ResponseObj.error(400,"'id' must be not null!");
+        }
+        vehicleDispatchService.update(kobject);
+        return ResponseObj.success("修改成功");
+    }
+
+
+    /**
+     * 查询是否有重复
+     * @param id
+     * @return
+     */
+    @GetMapping("/validateBySaleDetailId")
+    public ResponseObj validateBySaleDetailId(@RequestParam("type") Integer type, @RequestParam(value = "detailId",required = false) UUID detailId,@RequestParam(value = "id",required = false) UUID id){
+        KObject kObject = vehicleDispatchService.validateBySaleDetailId(type,id,detailId);
+        if(kObject != null){
+            return ResponseObj.error("已经有相同的派单记录存在,不可新增!");
+        }
+        return ResponseObj.success();
+    }
+
+}

backend/xyst.dinas.transport/src/main/model/com/xyst/dinas/transport/bill/VehicleDispatch.mk

+<model>
+    <header>
+        <type>bcp.biz.Bill</type>
+        <package>com.xyst.dinas.transport.bill</package>
+        <title>车辆派单</title>
+        <name>VehicleDispatch</name>
+        <description>车辆派单</description>
+    </header>
+    <content>
+        <bill>
+            <data>
+                {
+                "baseData": {
+                "name": "VehicleDispatch",
+                "title": "车辆派单",
+                "billModel": "com.beecode.bap.biztrait.BasicBillBiztrait",
+                "functionLibrarys": [],
+                "description": "车辆派单",
+                "dataModel": "com.xyst.dinas.transport.datamodel.VehicleDispatch"
+                },
+                "serial": {
+                "serialData": [
+                {
+                "segment": "literal",
+                "segmentData": "VD"
+                },
+                {
+                "segment": "sequence",
+                "segmentData": {
+                "start-with": 0,
+                "increment": 1,
+                "min": 0,
+                "max": 99999,
+                "length": 5,
+                "cycle": true,
+                "cut-direction": "left",
+                "pad-string": "0",
+                "pad-direction": "left",
+                "cache-size": 10
+                }
+                }
+                ],
+                "buildTime": "add"
+                },
+                "formula": [],
+                "workflow": {
+                "workflow": "",
+                "processParamConfig": []
+                },
+                "print": [],
+                "authority": []
+                }
+            </data>
+        </bill>
+    </content>
+</model>
\ No newline at end of file

backend/xyst.dinas.transport/src/main/model/com/xyst/dinas/transport/datamodel/VehicleDispatch.mk

+<model>
+	<header>
+		<type>bcp.type.DataModel</type>
+		<package>com.xyst.dinas.transport.datamodel</package>
+		<title>派单</title>
+		<name>VehicleDispatch</name>
+		<tags></tags>
+		<description>派单</description>
+		<templateName>mk.ide.ui.editor.data.model.template.bill</templateName>
+		<tablePrefix>xyst_dinas_transport_</tablePrefix>
+	</header>
+	<content>
+		<dataModel id='1db00987-2b98-4ff3-9d72-3b49bb7c69b7' multiVersion='' domainInherit='undefined' tableName='xyst_dinas_transport_vehicle_dispatch'>
+			<parent>com.beecode.bap.biztrait.datamodel.BasicBillRequirement</parent>
+			<parent>com.beecode.inz.common.datamodel.BaseInfo</parent>
+			<attribute id='50a42721-e1ed-41b3-ac2e-2f48dacaff57' name='regionalCompany' columnName='regional_company_id' title='区域公司' type='com.xyst.dinas.biz.datamodel.xystOrganization' default='' precision='' isArray='false'>
+ 				<annotation id='dcd05bf3-b1fa-4e78-906a-4149b200506d' attributeId='18c95292-66bf-4e4c-9cb2-3428c2e716d7' name='length' value='undefined'>
+ 				</annotation>
+				<annotation id='c72f42ae-fb80-4d64-9b32-62aaaba837bf' attributeId='600bb3d2-d08e-415f-ae88-bcb560138bea' name='mappingType' value='many-to-one'>
+ 				</annotation>
+			</attribute>
+            <attribute id='d0cf185d-f3fc-4934-bee5-d9f8430a353b' name='purchaseSandUnit' columnName='purchase_sand_unit_id' title='购砂单位' type='com.xyst.dinas.project.datamodel.PurchaseSandCompany' default='' precision='' isArray='false'>
+                <annotation id='d8890244-4be7-4fe1-9299-34556620992d' attributeId='b6d8786d-e80f-4132-8c9d-2aa5359e1ad9' name='length' value='undefined'>
+                </annotation>
+                <annotation id='323bc1a8-2e02-4c6d-bb30-bf1cae152f7a' attributeId='3d3637cc-73fa-4184-bd18-bdb539fd2332' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+            <attribute id='1ac037e2-0106-4b49-b8e2-e3d452b5bc56' name='planningCycle' columnName='planning_cycle_id' title='计划周期' type='com.xyst.dinas.biz.datamodel.PlanningCycle' default='' precision='' isArray='false'>
+                <annotation id='fcf6d84a-8501-44d5-ae88-ed24ef33fae7' attributeId='466fe172-99c5-44c1-8784-08b7ee4afb27' name='length' value='undefined'>
+                </annotation>
+                <annotation id='a5bf1650-2d58-4b23-bd69-143c880499f0' attributeId='e4f9dcce-d697-4661-955c-e81a957891e5' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+			<attribute id='2fb438e0-5c8e-42e1-9810-c24978bd311e' name='project' columnName='project_id' title='项目' type='com.xyst.dinas.project.datamodel.ProjectFiled' default='' precision='' isArray='false'>
+ 				<annotation id='a579516c-50e2-487a-b426-4eee41ff8091' attributeId='48cb7b55-651b-4ae0-a5fb-706f3526a684' name='length' value='undefined'>
+ 				</annotation>
+				<annotation id='b18cbf46-a74d-4ccb-a5c3-f2c88365eceb' attributeId='bcaf803f-d009-478e-ba31-d4e14eb9bd40' name='mappingType' value='many-to-one'>
+ 				</annotation>
+			</attribute>
+            <attribute id='4ebac38a-4630-4fc2-9c44-e3ea7684f1cc' name='contract' columnName='contract_id' title='合同' type='com.xyst.dinas.contract.datamodel.Contract' default='' precision='' isArray='false'>
+                <annotation id='8432c934-5127-421e-9741-e49891407328' attributeId='0e1a4208-82e7-4aa0-9830-48e64004c80b' name='length' value='undefined'>
+                </annotation>
+                <annotation id='d13dc0a6-6e78-4eda-884a-10c8b5d4d1bd' attributeId='8edc23c5-f707-4bc6-9eb8-91d29077c342' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+            <attribute id='608f2ca6-2aa8-4ea1-a60d-6a4459262bf0' name='dinasType' columnName='dinas_type_id' title='砂石类型' type='com.xyst.dinas.biz.datamodel.DinasType' default='' precision='' isArray='false'>
+                <annotation id='273e5009-7f78-47ef-985f-7c0ec62fff49' attributeId='d3becacd-0544-43f3-9e48-1cc2cbb6a544' name='length' value='undefined'>
+                </annotation>
+                <annotation id='023962df-ba93-495f-b18e-5e7098dc009d' attributeId='8fe4336c-f2a3-46e9-95cd-6f0d578ec83e' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+            <attribute id='dbe132cc-d491-4d54-92fc-0f4a12b458f9' name='station' columnName='station_id' title='场站' type='com.xyst.dinas.biz.datamodel.Station' default='' precision='' isArray='false'>
+                <annotation id='2f6b5380-c415-44bb-995b-3291a461e040' attributeId='6d9a6246-778e-4005-acb5-46c8f152bee7' name='length' value='undefined'>
+                </annotation>
+                <annotation id='9fe64d3c-3ba0-44f1-ae4b-8d9807d9de24' attributeId='41976453-b72f-40ed-8452-fb276fa5718f' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+            <attribute id='476b3cff-90cb-408d-9a95-07ad123f72ad' name='actualTransportation' columnName='actual_transportation' title='实际运输量' type='fixnum' default='' precision='' isArray='false'>
+                <annotation id='4ec81c64-e56c-489e-95ae-5b09e557da2b' attributeId='69db6227-25a1-4307-bf0d-2fb822f056ec' name='length' value='undefined'>
+                </annotation>
+            </attribute>
+            <attribute id='476b3cff-90cb-408d-9a95-07ad123f72ad' name='planAmount' columnName='plan_amount' title='计划供应量' type='fixnum' default='' precision='' isArray='false'>
+                <annotation id='4ec81c64-e56c-489e-95ae-5b09e557da2b' attributeId='69db6227-25a1-4307-bf0d-2fb822f056ec' name='length' value='undefined'>
+                </annotation>
+            </attribute>
+            <attribute id='ac544af3-d860-49d2-b45d-dbf9f11e733c' name='transportCompany' columnName='transport_company_id' title='运输公司' type='com.xyst.dinas.transport.datamodel.TransportCompany' default='' precision='' isArray='false'>
+                <annotation id='292d70eb-0c6c-40b4-9a48-8c5c2bc40365' attributeId='d1002b0b-ce99-4fb4-9aa6-e9c7ecb4da89' name='length' value='undefined'>
+                </annotation>
+                <annotation id='2e1da045-0427-4ed3-be74-b47ed98368a9' attributeId='7b29b169-487f-40ec-86ed-4ebbde02f8bc' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+
+            <attribute id='f900eea9-dc33-4649-902b-337484caccc8' name='transportVehicle' columnName='transport_vehicle_id' title='运输车辆' type='com.xyst.dinas.transport.datamodel.TransportVehicle' default='' precision='' isArray='false'>
+                <annotation id='7b98edb4-8c41-4753-8c01-476c6eb6cab7' attributeId='b1690947-eba0-4d81-8937-00551fd5fd44' name='length' value='undefined'>
+                </annotation>
+                <annotation id='c6dc82dd-71a9-49f7-8e95-c49572236938' attributeId='92e5c12e-a64a-4208-a433-d5aed487d2eb' name='mappingType' value='many-to-one'>
+                </annotation>
+            </attribute>
+
+            <attribute id='df798a17-851b-41ac-80a7-80e999b0d03d' name='sealDetailId' columnName='seal_detail_id' title='所属关联表的id,如果是需用计划,则是销售计划子表id,如果是临时销售计划,则是临时销售计划子表id' type='uuid' default='' precision='' isArray='false'>
+                <annotation id='910161b4-e310-4fad-94bb-d1953090c51e' attributeId='6536a457-938f-42ed-b307-4849423961a2' name='length' value='undefined'>
+                </annotation>
+            </attribute>
+
+            <attribute id='6f3b399f-6f25-4e8c-adf3-34819bc43c89' name='dispatchStatus' columnName='dispatch_status' title='状态' type='int' default='' precision='' isArray='false'>
+                <annotation id='ba759521-c96c-4114-989f-203ecf6ea94a' attributeId='d71af76e-2c00-4bd1-b052-5736da4977a5'
+                            name='length' value='1'/>
+            </attribute>
+            <attribute id='e7deb017-6647-4c68-b0da-02b96943cc08' name='dispatchType' columnName='dispatch_type' title='类型' type='int' default='' precision='' isArray='false'>
+                <annotation id='427005fb-388b-4e47-8072-764ffb5c9a42' attributeId='50431d6b-3dfe-4df5-ad19-1f42314f74db'
+                            name='length' value='1'/>
+            </attribute>
+			<hibernate>/xyst.dinas.transport/src/main/resources/config/VehicleDispatch.hbm.xml</hibernate>
+		</dataModel>
+	</content>
+</model>
\ No newline at end of file

backend/xyst.dinas.transport/src/main/model/com/xyst/dinas/transport/query/VehicleDispatch.mk

+<model>
+  <header>
+    <type>inz.query.Query</type>
+    <package>com.xyst.dinas.transport.query</package>
+    <name>VehicleDispatch</name>
+    <title>派单</title>
+    <tags></tags>
+    <description></description>
+  </header>
+  <content>
+    <customQuery id='ffc2c340-6f04-48e2-a60b-f200a6f9c557'>
+      <kclass>com.xyst.dinas.transport.datamodel.VehicleDispatch</kclass>
+      <authorityItem></authorityItem>
+      <innerScene title='全部'>
+        <id>0acfff9b-03e4-4968-a85b-53b6ef97d42a</id>
+        <javaImplement>com.beecode.inz.common.scene.CommonAllScene</javaImplement>
+        <defaultExecute></defaultExecute>
+        <hide></hide>
+      </innerScene>
+      <innerScene title='已废弃'>
+        <id>e55b0064-3cd9-4823-a3f7-a70c624fbd16</id>
+        <javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</javaImplement>
+        <defaultExecute></defaultExecute>
+        <hide></hide>
+      </innerScene>
+      <innerScene title='权限过滤'>
+        <id>7e951a57-dc0c-4032-98b5-35cb2ef75137</id>
+        <javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</javaImplement>
+        <defaultExecute>true</defaultExecute>
+        <hide>true</hide>
+      </innerScene>
+      <field title='id'>
+        <name>id</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='区域公司id'>
+        <name>regionalCompany.id</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='区域公司'>
+        <name>regionalCompany.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.xystOrganization</name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='计划周期'>
+        <name>planningCycle.id</name>
+        <type>uuid</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='计划周期title'>
+        <name>planningCycle.title</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='计划周期开始时间'>
+        <name>planningCycle.startTime</name>
+        <type>datetime</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='计划周期结束时间'>
+        <name>planningCycle.endTime</name>
+        <type>datetime</type>
+        <ref>
+          <type></type>
+          <name>com.xyst.dinas.biz.datamodel.PlanningCycle</name>
+        </ref>
+        <description></description>
+      </field>
+
+        <field title='项目id'>
+            <name>project.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='项目'>
+            <name>project.projectName</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.project.datamodel.ProjectFiled</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='合同id'>
+            <name>contract.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.contract.datamodel.Contract</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='合同'>
+            <name>contract.contractName</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.contract.datamodel.Contract</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='砂石类型id'>
+            <name>dinasType.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.biz.datamodel.DinasType</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='砂石类型'>
+            <name>dinasType.dinasTypeName</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.biz.datamodel.DinasType</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='场站id'>
+            <name>station.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.biz.datamodel.Station</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='场站名称'>
+            <name>station.stationeName</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.biz.datamodel.Station</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='运输公司id'>
+            <name>transportCompany.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.transport.datamodel.TransportCompany</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='运输公司'>
+            <name>transportCompany.companyName</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.transport.datamodel.TransportCompany</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='运输车辆id'>
+            <name>transportVehicle.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.transport.datamodel.TransportVehicle</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='运输车辆'>
+            <name>transportVehicle.plateNumber</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.transport.datamodel.TransportVehicle</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='购砂单位id'>
+            <name>purchaseSandUnit.id</name>
+            <type>uuid</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
+            </ref>
+            <description></description>
+        </field>
+        <field title='购砂单位'>
+            <name>purchaseSandUnit.name</name>
+            <type>string</type>
+            <ref>
+                <type></type>
+                <name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</name>
+            </ref>
+            <description></description>
+        </field>
+
+        <field title='派单状态'>
+            <name>dispatchStatus</name>
+            <type>int</type>
+            <ref>
+                <type/>
+            </ref>
+            <description></description>
+        </field>
+
+        <field title='派单类型'>
+            <name>dispatchType</name>
+            <type>int</type>
+            <ref>
+                <type/>
+            </ref>
+            <description>0临时销售计划 1需用计划</description>
+        </field>
+
+        <field title='实际运输量'>
+            <name>actualTransportation</name>
+            <type>fixnum</type>
+            <ref>
+                <type/>
+            </ref>
+            <description/>
+        </field>
+
+        <field title='计划销售量'>
+            <name>planAmount</name>
+            <type>fixnum</type>
+            <ref>
+                <type/>
+            </ref>
+            <description/>
+        </field>
+
+      <field title='创建时间'>
+        <name>createTime</name>
+        <type>datetime</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='创建人'>
+        <name>creator.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='修改时间'>
+        <name>modifyTime</name>
+        <type>datetime</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='修改人'>
+        <name>modifier.name</name>
+        <type>string</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+      <field title='废弃'>
+        <name>discard</name>
+        <type>boolean</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+
+      <field title='删除'>
+        <name>del</name>
+        <type>boolean</type>
+        <ref>
+          <type></type>
+          <name></name>
+        </ref>
+        <description></description>
+      </field>
+
+    </customQuery>
+  </content>
+</model>
\ No newline at end of file

backend/xyst.dinas.transport/src/main/resources/META-INF/spring.factories

 # Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.xyst.dinas.transport.config.VehicleDispatchConfiguration
\ No newline at end of file

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>
+	<name>com.xyst.dinas.transport.bill.VehicleDispatch$sequence</name>
+	<title>车辆派单$sequence</title>
+	<description>车辆派单</description>
+	<define>bcp.sequence</define>
+	<define-version>1.0</define-version>
+	<content>
+		<m:sequence>
+			<m:start-with>0</m:start-with>
+			<m:increment>1</m:increment>
+			<m:max>99999</m:max>
+			<m:min>0</m:min>
+			<m:cycle>true</m:cycle>
+			<m:cache-size>10</m:cache-size>
+		</m:sequence>
+	</content>
+</metadata>

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch$serial.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-serial">
+	<specification>1.0</specification>
+	<id>6dc68fc8-32cf-4cb9-b152-a443b297ec22</id>
+	<name>com.xyst.dinas.transport.bill.VehicleDispatch$serial</name>
+	<title>车辆派单$serial</title>
+	<description>车辆派单</description>
+	<define>bcp.serial</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.transport.datamodel.VehicleDispatch</dependency>
+	<dependency>com.xyst.dinas.transport.bill.VehicleDispatch$sequence</dependency>
+	<content>
+		<m:serial>
+			<m:input>com.xyst.dinas.transport.datamodel.VehicleDispatch</m:input>
+			<m:functionLibrarys/>
+			<m:segments>
+				<m:literal>
+					<m:value>VD</m:value>
+				</m:literal>
+				<m:sequence>
+					<m:length>5</m:length>
+					<m:pad-direction>left</m:pad-direction>
+					<m:pad-string>0</m:pad-string>
+					<m:key>com.xyst.dinas.transport.bill.VehicleDispatch$serial</m:key>
+					<m:sequenceName>com.xyst.dinas.transport.bill.VehicleDispatch$sequence</m:sequenceName>
+				</m:sequence>
+			</m:segments>
+		</m:serial>
+	</content>
+</metadata>

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/bill/VehicleDispatch.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-biztype">
+	<specification>1.0</specification>
+	<id>f81d69f4-763c-4675-88bb-be19f2cd8975</id>
+	<name>com.xyst.dinas.transport.bill.VehicleDispatch</name>
+	<title>车辆派单</title>
+	<description>车辆派单</description>
+	<define>bcp.biz.Biztype</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.transport.datamodel.VehicleDispatch</dependency>
+	<dependency>com.beecode.bap.biztrait.BasicBillBiztrait</dependency>
+	<dependency>com.xyst.dinas.transport.bill.VehicleDispatch$serial</dependency>
+	<content>
+		<m:biztype>
+			<m:type>com.xyst.dinas.transport.datamodel.VehicleDispatch</m:type>
+			<m:inheritances>
+				<m:inheritance>
+					<m:biztrait>com.beecode.bap.biztrait.BasicBillBiztrait</m:biztrait>
+					<m:config type="xml">
+						<m:content>&lt;billBasictraitConfig&gt;&lt;formulas/&gt;&lt;parents&gt;&lt;parent&gt;&lt;billCodeConfig&gt;&lt;serialName&gt;com.xyst.dinas.transport.bill.VehicleDispatch$serial&lt;/serialName&gt;&lt;buildTime&gt;add&lt;/buildTime&gt;&lt;/billCodeConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;workflowConfig&gt;&lt;workflow&gt;&lt;/workflow&gt;&lt;/workflowConfig&gt;&lt;/parent&gt;&lt;parent&gt;&lt;printConfig&gt;&lt;templates/&gt;&lt;/printConfig&gt;&lt;/parent&gt;&lt;/parents&gt;&lt;functionLibrarys/&gt;&lt;/billBasictraitConfig&gt;</m:content>
+					</m:config>
+				</m:inheritance>
+			</m:inheritances>
+			<m:methodAuthorityItems/>
+		</m:biztype>
+	</content>
+</metadata>

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/datamodel/TransportCompany.jmx

@@ -41,8 +41,8 @@
 					<m:name>businessLicense</m:name>
 					<m:title>营业执照</m:title>
 					<m:type>string</m:type>
-					<m:description></m:description>
-					<m:default></m:default>
+                    <m:description/>
+                    <m:default/>
 				</m:attribute>
 				<m:attribute>
 					<m:id>8e841e01-6f40-4052-ae19-49274828e3ec</m:id>

backend/xyst.dinas.transport/src/main/resources/com/xyst/dinas/transport/query/VehicleDispatch.jmx

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata" xmlns:m="http://www.beecode.cn/schema/inz-query">
+	<specification>1.0</specification>
+	<id>ffc2c340-6f04-48e2-a60b-f200a6f9c557</id>
+	<name>com.xyst.dinas.transport.query.VehicleDispatch</name>
+	<title>派单</title>
+	<define>inz.query.Query</define>
+	<define-version>1.0</define-version>
+	<dependency>com.xyst.dinas.transport.datamodel.VehicleDispatch</dependency>
+	<content>
+		<m:query>
+			<m:type>com.xyst.dinas.transport.datamodel.VehicleDispatch</m:type>
+			<m:dataProcessor></m:dataProcessor>
+			<m:authorityItem></m:authorityItem>
+			<m:innerScenes>
+				<m:innerScene>
+					<m:id>0acfff9b-03e4-4968-a85b-53b6ef97d42a</m:id>
+					<m:title>全部</m:title>
+					<m:javaImplement>com.beecode.inz.common.scene.CommonAllScene</m:javaImplement>
+					<m:defaultExecute></m:defaultExecute>
+					<m:hide></m:hide>
+				</m:innerScene>
+				<m:innerScene>
+					<m:id>e55b0064-3cd9-4823-a3f7-a70c624fbd16</m:id>
+					<m:title>已废弃</m:title>
+					<m:javaImplement>com.beecode.inz.common.scene.DefaultDiscardScene</m:javaImplement>
+					<m:defaultExecute></m:defaultExecute>
+					<m:hide></m:hide>
+				</m:innerScene>
+				<m:innerScene>
+					<m:id>7e951a57-dc0c-4032-98b5-35cb2ef75137</m:id>
+					<m:title>权限过滤</m:title>
+					<m:javaImplement>com.xyst.dinas.biz.scene.XystDinasCommonAllScene</m:javaImplement>
+					<m:defaultExecute>true</m:defaultExecute>
+					<m:hide>true</m:hide>
+				</m:innerScene>
+			</m:innerScenes>
+			<m:fields>
+				<m:field>
+					<m:name>id</m:name>
+					<m:title>id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>regionalCompany.id</m:name>
+					<m:title>区域公司id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>regionalCompany.name</m:name>
+					<m:title>区域公司</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.xystOrganization</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>planningCycle.id</m:name>
+					<m:title>计划周期</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>planningCycle.title</m:name>
+					<m:title>计划周期title</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>planningCycle.startTime</m:name>
+					<m:title>计划周期开始时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>planningCycle.endTime</m:name>
+					<m:title>计划周期结束时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.PlanningCycle</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>project.id</m:name>
+					<m:title>项目id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>project.projectName</m:name>
+					<m:title>项目</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.project.datamodel.ProjectFiled</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>contract.id</m:name>
+					<m:title>合同id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>contract.contractName</m:name>
+					<m:title>合同</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.contract.datamodel.Contract</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>dinasType.id</m:name>
+					<m:title>砂石类型id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.DinasType</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>dinasType.dinasTypeName</m:name>
+					<m:title>砂石类型</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.DinasType</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>station.id</m:name>
+					<m:title>场站id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>station.stationeName</m:name>
+					<m:title>场站名称</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.biz.datamodel.Station</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>transportCompany.id</m:name>
+					<m:title>运输公司id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.transport.datamodel.TransportCompany</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>transportCompany.companyName</m:name>
+					<m:title>运输公司</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.transport.datamodel.TransportCompany</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>transportVehicle.id</m:name>
+					<m:title>运输车辆id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.transport.datamodel.TransportVehicle</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>transportVehicle.plateNumber</m:name>
+					<m:title>运输车辆</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.transport.datamodel.TransportVehicle</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>purchaseSandUnit.id</m:name>
+					<m:title>购砂单位id</m:title>
+					<m:type>uuid</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>purchaseSandUnit.name</m:name>
+					<m:title>购砂单位</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name>com.xyst.dinas.project.datamodel.PurchaseSandCompany</m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>dispatchStatus</m:name>
+					<m:title>派单状态</m:title>
+					<m:type>int</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>dispatchType</m:name>
+					<m:title>派单类型</m:title>
+					<m:type>int</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc>0临时销售计划 1需用计划</m:desc>
+				</m:field>
+				<m:field>
+					<m:name>actualTransportation</m:name>
+					<m:title>实际运输量</m:title>
+					<m:type>fixnum</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>planAmount</m:name>
+					<m:title>计划销售量</m:title>
+					<m:type>fixnum</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>createTime</m:name>
+					<m:title>创建时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>creator.name</m:name>
+					<m:title>创建人</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>modifyTime</m:name>
+					<m:title>修改时间</m:title>
+					<m:type>datetime</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>modifier.name</m:name>
+					<m:title>修改人</m:title>
+					<m:type>string</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>discard</m:name>
+					<m:title>废弃</m:title>
+					<m:type>boolean</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+				<m:field>
+					<m:name>del</m:name>
+					<m:title>删除</m:title>
+					<m:type>boolean</m:type>
+					<m:ref>
+						<m:name></m:name>
+						<m:type></m:type>
+					</m:ref>
+					<m:desc></m:desc>
+				</m:field>
+			</m:fields>
+		</m:query>
+	</content>
+</metadata>

backend/xyst.dinas.transport/src/main/resources/config/VehicleDispatch.hbm.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<hibernate-mapping xmlns="http://www.hibernate.org/xsd/hibernate-mapping"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.hibernate.org/xsd/hibernate-mapping
+		http://www.hibernate.org/xsd/hibernate-mapping/hibernate-mapping-4.0.xsd">
+    <class entity-name="com.xyst.dinas.transport.datamodel.VehicleDispatch" table="xyst_dinas_transport_vehicle_dispatch" optimistic-lock="version">
+        <tuplizer entity-mode="dynamic-map" class="com.beecode.bcp.store.hibernate.KObjectEntityTuplizer" />
+        <id name="id" type="uuid-binary" column="id" length="16">
+            <generator class="assigned" />
+        </id>
+        <version name="version" type="int" column="version"/>
+        <property name="createTime" type="timestamp" not-null="false">
+            <column name="create_time"/>
+        </property>
+        <many-to-one name="creator" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
+            <column name="creator_id"  not-null="false"/>
+        </many-to-one>
+        <property name="modifyTime" type="timestamp" not-null="false">
+            <column name="modify_time"/>
+        </property>
+        <many-to-one name="modifier" entity-name="com.beecode.bap.staff.datamodel.Staff" fetch="select">
+            <column name="modifier_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billState" type="nstring" not-null="false">
+            <column name="bill_state" length="100"/>
+        </property>
+        <many-to-one name="bizProcess" entity-name="com.beecode.bap.workflow.datamodel.BizProcess" fetch="select">
+            <column name="biz_process_id"  not-null="false"/>
+        </many-to-one>
+        <property name="billCode" type="nstring" not-null="false">
+            <column name="bill_code" length="200"/>
+        </property>
+        <property name="discard" type="boolean" not-null="false">
+            <column name="discard"/>
+        </property>
+        <property name="del" type="boolean" not-null="false">
+            <column name="del"/>
+        </property>
+        <property name="approveState" type="integer" not-null="false">
+            <column name="approve_state"/>
+        </property>
+
+        <many-to-one name="regionalCompany" entity-name="com.xyst.dinas.biz.datamodel.xystOrganization" fetch="select">
+            <column name="regional_company"  not-null="false">
+                <comment>所属组织机构</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="purchaseSandUnit" entity-name="com.xyst.dinas.project.datamodel.PurchaseSandCompany" fetch="select">
+            <column name="purchase_sand_unit_id"  not-null="false">
+                <comment>所属购砂单位</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="planningCycle" entity-name="com.xyst.dinas.biz.datamodel.PlanningCycle" fetch="select">
+            <column name="planning_cycle_id"  not-null="false">
+                <comment>所属计划周期</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="project" entity-name="com.xyst.dinas.project.datamodel.ProjectFiled" fetch="select">
+            <column name="project_id"  not-null="false">
+                <comment>所属项目</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="dinasType" entity-name="com.xyst.dinas.biz.datamodel.DinasType" fetch="select">
+            <column name="dinas_type_id"  not-null="false">
+                <comment>所属砂石类型</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="station" entity-name="com.xyst.dinas.biz.datamodel.Station" fetch="select">
+            <column name="station_id"  not-null="false">
+                <comment>所属场站</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="contract" entity-name="com.xyst.dinas.contract.datamodel.Contract" fetch="select">
+            <column name="contract_id"  not-null="false">
+                <comment>所属合同</comment>
+            </column>
+        </many-to-one>
+        <property name="actualTransportation" type="big_decimal" not-null="false">
+            <column name="actual_transportation" length="13">
+                <comment>实际运输量</comment>
+            </column>
+        </property>
+        <property name="planAmount" type="big_decimal" not-null="false">
+            <column name="plan_amount" length="13">
+                <comment>计划运输量</comment>
+            </column>
+        </property>
+        <property name="dispatchStatus" type="int" not-null="true">
+            <column name="dispatch_status" length="13">
+                <comment>状态</comment>
+            </column>
+        </property>
+        <property name="dispatchType" type="int" not-null="true">
+            <column name="dispatch_type" length="13">
+                <comment>类型0临时销售计划 1需用计划</comment>
+            </column>
+        </property>
+        <property name="sealDetailId" type="uuid-binary" not-null="true">
+            <column name="seal_detail_id" length="16">
+                <comment>销售计划子表或者临时销售计划子表的id</comment>
+            </column>
+        </property>
+        <many-to-one name="transportVehicle" entity-name="com.xyst.dinas.transport.datamodel.TransportVehicle" fetch="select">
+            <column name="transport_vehicle_id"  not-null="false">
+                <comment>派单车辆</comment>
+            </column>
+        </many-to-one>
+        <many-to-one name="transportCompany" entity-name="com.xyst.dinas.transport.datamodel.TransportCompany" fetch="select">
+            <column name="transport_company_id"  not-null="false">
+                <comment>派单公司</comment>
+            </column>
+        </many-to-one>
+    </class>
+</hibernate-mapping>
\ No newline at end of file