|
|
@@ -2992,11 +2992,13 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
if (contractManagementInfo != null) {
|
|
|
ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
.eq("contract_id", contractManagementInfo.getId()));
|
|
|
- TranTaskInfo tranTaskInfo =tranTaskInfoService.selectOne(new EntityWrapper<TranTaskInfo>()
|
|
|
+ List<TranTaskInfo> tranTaskInfoList =tranTaskInfoService.selectList(new EntityWrapper<TranTaskInfo>()
|
|
|
.eq("send_warehouse",warehouseName)
|
|
|
.eq("comp_id",compId)
|
|
|
.eq("contract_no", contractManagementInfo.getContractNo()));
|
|
|
- if (tranTaskInfo!=null){
|
|
|
+ List<TranCarInfo> newCarList = new ArrayList<>();
|
|
|
+ List<TranCarInfo> newCarList1 = new ArrayList<>();
|
|
|
+ for(TranTaskInfo tranTaskInfo : tranTaskInfoList){
|
|
|
//查合同下的车牌号,出库只能查到未出库的
|
|
|
List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
.eq("info_id", tranTaskInfo.getId()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
|
|
|
@@ -3004,23 +3006,26 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
.orderBy("tran_car_no",true));
|
|
|
if (!CollectionUtils.isEmpty(tranCarInfoList)) {
|
|
|
List<String> carList = new ArrayList<>();
|
|
|
- List<TranCarInfo> newCarList = new ArrayList<>();
|
|
|
for(int i = 0; i < tranCarInfoList.size(); i++){
|
|
|
if(!carList.contains(tranCarInfoList.get(i).getCarNo())){
|
|
|
carList.add(tranCarInfoList.get(i).getCarNo());
|
|
|
newCarList.add(tranCarInfoList.get(i));
|
|
|
}
|
|
|
}
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfoList);
|
|
|
}
|
|
|
List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
.eq("info_id",tranTaskInfo.getId())
|
|
|
.eq("fleet_flag", "1")
|
|
|
.last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
|
|
|
if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
|
|
|
- contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
|
|
|
+ for(int i = 0; i < tranCarInfoList1.size(); i++){
|
|
|
+ newCarList1.add(tranCarInfoList1.get(i));
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
+ contractManagementInfo.setTranCarInfoList(newCarList);
|
|
|
+ contractManagementInfo.setTranCarInfoList1(newCarList1);
|
|
|
//查船名
|
|
|
Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
|
|
|
shipListWrapper.eq("contract_no", contractManagementInfo.getContractNo())
|
