Skip to content

C
cloud-fb
Commit c9812931 by yanHeng
Options

[修改] 地磅数据兼容

parent 5e3c039d
Showing with 39 additions and 38 deletions
backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/internal/dao/SelfPickupCarDaoImpl.java
......@@ -3,9 +3,9 @@ package com.xyst.dinas.contract.internal.dao;
import com.beecode.amino.core.Amino;
import com.beecode.bcp.type.KClass;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.biz.enumeration.SubmitStateEnum;
import com.xyst.dinas.contract.constant.SelfPickupCarConstant;
import com.xyst.dinas.contract.dao.SelfPickupCarDao;
import com.xyst.dinas.contract.enumeration.ContractStateEnum;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.hibernate.criterion.DetachedCriteria;
......@@ -53,7 +53,10 @@ public class SelfPickupCarDaoImpl implements SelfPickupCarDao {
public List<KObject> queryListByCar(String carNum) {
KClass bean = Amino.getStaticMetadataContext().getBean(SelfPickupCarConstant.ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
detachedCriteria.createAlias("contract", "contract");
detachedCriteria.add(Restrictions.like("carInfo", "%"+carNum+"%"));
detachedCriteria.add(Restrictions.eq("contract.contractState", ContractStateEnum.EXECUTING.name()));
detachedCriteria.add(Restrictions.eq("discard", false));
return (List<KObject>)template.findByCriteria(detachedCriteria);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/NeedPlanDao.java
package com.xyst.dinas.sales.dao;
import com.beecode.bcp.type.KObject;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
public interface NeedPlanDao {
KObject queryNeedPlanByContractIdAndCycleId(UUID planningCycleId, UUID contractId);
......@@ -28,7 +28,7 @@ public interface NeedPlanDao {
KObject queryNeedPlanAmountByCycleId(UUID planningCycleId, UUID projectId);
List<KObject> getByCarAndPlanningCycle(String carNum, KObject planningCycleObj);
List<KObject> getByCarAndPlanningCycle(String carNum, KObject planningCycleObj,UUID contractId);
KObject queryDetailById(UUID fromString);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/dao/SalesPlanDao.java
......@@ -351,7 +351,7 @@ public class SalesPlanDao {
* @param station
* @return
*/
public List<KObject> getSaleTempByCarNum(String carNum, KObject station) {
public List<KObject> getSaleTempByCarNum(String carNum, KObject station,UUID contractId) {
KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_TEMP, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
......@@ -363,6 +363,7 @@ public class SalesPlanDao {
detachedCriteria.add(Restrictions.eq("station.id", station.getUuid("id")));
// modify by 销售计划车辆撤销不维护 from yanH start
// detachedCriteria.add(Restrictions.like("carNumber", "%"+carNum+"%"));
detachedCriteria.add(Restrictions.eq("contract.id", contractId));
return (List<KObject>) template.findByCriteria(detachedCriteria);
}
......@@ -399,7 +400,7 @@ public class SalesPlanDao {
* @param station
* @return
*/
public List<KObject> getSaleByCarNum(String carNum, KObject station) {
public List<KObject> getSaleByCarNum(String carNum, KObject station,UUID contractId) {
KClass bean = Amino.getStaticMetadataContext().getBean(SalesPlanConstant.ENTITY_DETAIL, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
......@@ -414,6 +415,7 @@ public class SalesPlanDao {
detachedCriteria.add(Restrictions.eq(BaseConstants.MASTER+"."+SalesPlanConstant.APPROVE_STATE, BizProcessState.DONE_WITH_AGREE.getValue()));
// modify by 销售计划车辆撤销不维护 from yanH start
// detachedCriteria.add(Restrictions.like("contract.carInfo", "%"+carNum+"%"));
detachedCriteria.add(Restrictions.eq("contract.id", contractId));
return (List<KObject>) template.findByCriteria(detachedCriteria);
}
}
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/dao/NeedPlanDaoImpl.java
......@@ -161,7 +161,7 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
}
@Override
public List<KObject> getByCarAndPlanningCycle(String carNum, KObject planningCycleObj) {
public List<KObject> getByCarAndPlanningCycle(String carNum, KObject planningCycleObj,UUID contractId) {
KClass bean = Amino.getStaticMetadataContext().getBean(NEED_PLAN_ENTITY, KClass.class);
DetachedCriteria detachedCriteria = DetachedCriteria.forEntityName(bean.getName());
dinasTypeDao.addRegionalCompanyFilter(detachedCriteria);
......@@ -169,6 +169,7 @@ public class NeedPlanDaoImpl implements NeedPlanDao, NeedPlanConstant {
detachedCriteria.add(Restrictions.eq("planningCycle.id", planningCycleObj.getUuid("id")));
// modify by 销售计划车辆撤销不维护 from yanH start
// detachedCriteria.add(Restrictions.like("transportLicensePlateNumber", "%"+carNum+"%"));
detachedCriteria.add(Restrictions.eq("contract.id", contractId));
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.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
import com.xyst.dinas.biz.enumeration.PlanningCycleEnum;
import org.springframework.beans.factory.annotation.Autowired;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.biz.constant.PlanningCycleConstant;
import com.xyst.dinas.biz.enumeration.PlanningCycleEnum;
import com.xyst.dinas.biz.service.PlanningCycleService;
import com.xyst.dinas.contract.service.ContractService;
import com.xyst.dinas.sales.dao.NeedPlanDao;
import com.xyst.dinas.sales.dao.SalesPlanDao;
import com.xyst.dinas.sales.entity.ContractExecuteDetail;
import com.xyst.dinas.sales.service.NeedPlanService;
import org.springframework.beans.factory.annotation.Autowired;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
public class NeedPlanServiceImpl implements NeedPlanService {
......@@ -183,11 +177,11 @@ public class NeedPlanServiceImpl implements NeedPlanService {
}
@Override
public List<KObject> queryNeedPlanByCarNumAndPlanningCycle(KObject station, String carNum, Date date) {
public List<KObject> queryNeedPlanByCarNumAndPlanningCycle(KObject station, String carNum, Date date,UUID contractId) {
//
String planningCycle = station.get("regionalCompany").getString("planningCycle");
PlanningCycleEnum planningCycleEnum = PlanningCycleEnum.valueOf(planningCycle);
KObject planningCycleObj = planningCycleService.getPlanningCycleObj(planningCycleEnum, date);
return needPlanDao.getByCarAndPlanningCycle(carNum,planningCycleObj);
return needPlanDao.getByCarAndPlanningCycle(carNum,planningCycleObj, contractId);
}
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/internal/service/SalesPlanServiceImpl.java
......@@ -540,15 +540,15 @@ public class SalesPlanServiceImpl implements SalesPlanService {
}
@Override
public List<Map<String, Object>> querySalesPlanByCarNum(KObject station, String carNum) {
public List<Map<String, Object>> querySalesPlanByCarNum(KObject station, String carNum ,UUID contractId) {
//根据车牌号获取需用计划,每个车牌可能有多个需用计划
List<KObject> plans = needPlanService.queryNeedPlanByCarNumAndPlanningCycle(station, carNum, new Date());
List<KObject> plans = needPlanService.queryNeedPlanByCarNumAndPlanningCycle(station, carNum, new Date(),contractId);
//根据计划周期和合同编号获取本次购砂单位实际可以分配的砂石类型
//根据需用计划中计划周期和合同获取销售计划
ArrayList<Map<String, Object>> maps = new ArrayList<>();
List<KObject> saleTempByCarNum = salesPlanDao.getSaleTempByCarNum(carNum, station);
List<KObject> saleTempByCarNum = salesPlanDao.getSaleTempByCarNum(carNum, station,contractId);
//没有需用计划却提了销售计划的可能,线下提销售计划
List<KObject> saleDetails = salesPlanDao.getSaleByCarNum(carNum, station);
List<KObject> saleDetails = salesPlanDao.getSaleByCarNum(carNum, station,contractId);
for (KObject saleDetail : saleDetails) {
KObject sale = saleDetail.get("master");
......
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/NeedPlanService.java
package com.xyst.dinas.sales.service;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.entity.ContractExecuteDetail;
import java.util.Date;
import java.util.List;
import java.util.UUID;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.entity.ContractExecuteDetail;
public interface NeedPlanService {
......@@ -31,5 +31,5 @@ public interface NeedPlanService {
KObject querySalePlanByCycleId(UUID fromString);
List<KObject> queryNeedPlanByCarNumAndPlanningCycle(KObject station, String carNum, Date date);
List<KObject> queryNeedPlanByCarNumAndPlanningCycle(KObject station, String carNum, Date date,UUID contractId);
}
backend/xyst.dinas.sales/src/main/java/com/xyst/dinas/sales/service/SalesPlanService.java
package com.xyst.dinas.sales.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.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.json.JSONObject;
import org.springframework.lang.Nullable;
import com.beecode.bcp.type.KObject;
import com.xyst.dinas.sales.web.request.SaleaPlanDetailQuery;
public interface SalesPlanService {
/**
......@@ -88,6 +87,6 @@ public interface SalesPlanService {
List<KObject> getSealTempDinasTypeListByNeedPlanInfo(UUID purchaseSandUnitId, UUID planningCycleId, UUID projectId);
List<Map<String, Object>> querySalesPlanByCarNum(KObject station, String carNum);
List<Map<String, Object>> querySalesPlanByCarNum(KObject station, String carNum,UUID contractId);
}
backend/xyst.dinas.transport/src/main/java/com/xyst/dinas/transport/web/WeighbridgeSyncController.java
......@@ -99,12 +99,14 @@ public class WeighbridgeSyncController {
List<KObject> carInfoKObject = selfPickupCarService.queryListByCar(carNum);
if(carInfoKObject.size() > 0){ //如果有数据则为自提数据
//根据车牌查询所属合同和销售计划
List<Map<String, Object>> salesPlan = salesPlanService.querySalesPlanByCarNum(station, carNum);
//获取自提车辆对应的合同id
UUID contractId = carInfoKObject.get(0).get("contract").getUuid("id");
List<Map<String, Object>> salesPlan = salesPlanService.querySalesPlanByCarNum(station, carNum,contractId);
Collection<? extends Map<String, Object>> maps = vehicleDispatchService.vehicleDispatchService(station, carNum);
if (maps != null) {
salesPlan.addAll(maps);
}
if(salesPlan != null || salesPlan.size()>0 ){
if(salesPlan.size() > 0 ){
returnMap.put("saleType",1);
returnMap.put("data",salesPlan);
return returnMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment