|
|
@@ -1081,235 +1081,235 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
|
|
|
}
|
|
|
//查采购合同编号(不包含自运）,以及移库任务编号,销售合同
|
|
|
else if (flag == 7) {
|
|
|
- Map<String, Object> pageView = new HashMap<>();
|
|
|
- pageView.put("compId", compId);
|
|
|
- pageView.put("contractType", '2');
|
|
|
- pageView.put("statusFlag", '1');
|
|
|
- pageView.put("deliverType", '2');
|
|
|
- pageView.put("fleetFlag", '0');
|
|
|
- pageView.put("tranType", '4');
|
|
|
- pageView.put("threeTranType", "汽运");
|
|
|
- pageView.put("submit", '2');
|
|
|
- pageView.put("flag", '1');
|
|
|
- //查合同下的车牌号,入库只能查到未提交的
|
|
|
- List<TranCarInfo> tranCarInfoLists = baseMapper.getTranCarInfo(pageView);
|
|
|
- /*****************************/
|
|
|
- Map<String, Object> pageView1 = new HashMap<>();
|
|
|
- pageView1.put("compId", compId);
|
|
|
- pageView1.put("contractType", '2');
|
|
|
- pageView1.put("statusFlag", '1');
|
|
|
- pageView1.put("deliverType", '2');
|
|
|
- pageView1.put("fleetFlag", '1');
|
|
|
- pageView1.put("tranType", '4');
|
|
|
- pageView1.put("threeTranType", "汽运");
|
|
|
- pageView1.put("flag", '1');
|
|
|
- //查合同下的车牌号,入库只能查到未提交的
|
|
|
- List<TranCarInfo> tranCarInfoLists1 = baseMapper.getTranCarInfo(pageView1);
|
|
|
- /*****************************/
|
|
|
- Map<String, Object> pageView2 = new HashMap<>();
|
|
|
- pageView2.put("compId", compId);
|
|
|
- pageView2.put("contractType", '2');
|
|
|
- pageView2.put("statusFlag", '1');
|
|
|
- pageView2.put("deliverType", '2');
|
|
|
- pageView2.put("tranType", '3');
|
|
|
- pageView2.put("threeTranType", "散船");
|
|
|
- pageView2.put("flag", '2');
|
|
|
- //查合同下的车牌号,入库只能查到未提交的
|
|
|
- List<TranCarInfo> tranCarInfoLists2 = baseMapper.getTranCarInfo(pageView2);
|
|
|
- tranCarInfoLists.addAll(tranCarInfoLists1);
|
|
|
- tranCarInfoLists.addAll(tranCarInfoLists2);
|
|
|
- Set< TranCarInfo > set = new HashSet<>(tranCarInfoLists);
|
|
|
- tranCarInfoLists = set.stream()
|
|
|
- .sorted(Comparator.comparingInt(a -> Integer.parseInt(a.getContractId().substring(1, 25)))).collect(Collectors.toList());
|
|
|
-// List<ContractManagementInfo> contractManagementInfos = new ArrayList<>();
|
|
|
- ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
|
|
|
- List<TranCarInfo> tranCarInfos = new ArrayList<>();
|
|
|
- List<TranCarInfo> tranCarInfos1 = new ArrayList<>();
|
|
|
- List<TranCarInfo> tranCarInfos2 = new ArrayList<>();
|
|
|
- for (int i = 0; i < tranCarInfoLists.size(); i++) {
|
|
|
- TranCarInfo tranCarInfo = tranCarInfoLists.get(i);
|
|
|
+// Map<String, Object> pageView = new HashMap<>();
|
|
|
+// pageView.put("compId", compId);
|
|
|
+// pageView.put("contractType", '2');
|
|
|
+// pageView.put("statusFlag", '1');
|
|
|
+// pageView.put("deliverType", '2');
|
|
|
+// pageView.put("fleetFlag", '0');
|
|
|
+// pageView.put("tranType", '4');
|
|
|
+// pageView.put("threeTranType", "汽运");
|
|
|
+// pageView.put("submit", '2');
|
|
|
+// pageView.put("flag", '1');
|
|
|
+// //查合同下的车牌号,入库只能查到未提交的
|
|
|
+// List<TranCarInfo> tranCarInfoLists = baseMapper.getTranCarInfo(pageView);
|
|
|
+// /*****************************/
|
|
|
+// Map<String, Object> pageView1 = new HashMap<>();
|
|
|
+// pageView1.put("compId", compId);
|
|
|
+// pageView1.put("contractType", '2');
|
|
|
+// pageView1.put("statusFlag", '1');
|
|
|
+// pageView1.put("deliverType", '2');
|
|
|
+// pageView1.put("fleetFlag", '1');
|
|
|
+// pageView1.put("tranType", '4');
|
|
|
+// pageView1.put("threeTranType", "汽运");
|
|
|
+// pageView1.put("flag", '1');
|
|
|
+// //查合同下的车牌号,入库只能查到未提交的
|
|
|
+// List<TranCarInfo> tranCarInfoLists1 = baseMapper.getTranCarInfo(pageView1);
|
|
|
+// /*****************************/
|
|
|
+// Map<String, Object> pageView2 = new HashMap<>();
|
|
|
+// pageView2.put("compId", compId);
|
|
|
+// pageView2.put("contractType", '2');
|
|
|
+// pageView2.put("statusFlag", '1');
|
|
|
+// pageView2.put("deliverType", '2');
|
|
|
+// pageView2.put("tranType", '3');
|
|
|
+// pageView2.put("threeTranType", "散船");
|
|
|
+// pageView2.put("flag", '2');
|
|
|
+// //查合同下的车牌号,入库只能查到未提交的
|
|
|
+// List<TranCarInfo> tranCarInfoLists2 = baseMapper.getTranCarInfo(pageView2);
|
|
|
+// tranCarInfoLists.addAll(tranCarInfoLists1);
|
|
|
+// tranCarInfoLists.addAll(tranCarInfoLists2);
|
|
|
+// Set< TranCarInfo > set = new HashSet<>(tranCarInfoLists);
|
|
|
+// tranCarInfoLists = set.stream()
|
|
|
+// .sorted(Comparator.comparingInt(a -> Integer.parseInt(a.getContractId().substring(1, 25)))).collect(Collectors.toList());
|
|
|
+//// List<ContractManagementInfo> contractManagementInfos = new ArrayList<>();
|
|
|
+// ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
|
|
|
+// List<TranCarInfo> tranCarInfos = new ArrayList<>();
|
|
|
+// List<TranCarInfo> tranCarInfos1 = new ArrayList<>();
|
|
|
+// List<TranCarInfo> tranCarInfos2 = new ArrayList<>();
|
|
|
+// for (int i = 0; i < tranCarInfoLists.size(); i++) {
|
|
|
+// TranCarInfo tranCarInfo = tranCarInfoLists.get(i);
|
|
|
+//
|
|
|
+// if (contractManagementInfo.getUnitContractPrice() != null) {
|
|
|
+// //期货取点价，现货取单价
|
|
|
+// contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
+// }
|
|
|
+// if("0".equals(tranCarInfo.getFleetFlag())&&"4".equals(tranCarInfo.getTranType())&&"汽运".equals(tranCarInfo.getThreeTranType())&&"2".equals(tranCarInfo.getSubmit())) {
|
|
|
+// if (i == 0) {
|
|
|
+// contractManagementInfo = new ContractManagementInfo();
|
|
|
+// contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
+// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+// .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos = new ArrayList<>();
|
|
|
+// tranCarInfos1 = new ArrayList<>();
|
|
|
+// tranCarInfos2 = new ArrayList<>();
|
|
|
+// contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos.add(tranCarInfo);
|
|
|
+// } else if (!tranCarInfo.getContractId().equals(tranCarInfoLists.get(i - 1).getContractId())) {
|
|
|
+// contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
+// contractManagementInfo.setTranCarInfoList1(tranCarInfos1);
|
|
|
+// contractManagementInfo.setShipInfoList(tranCarInfos2);
|
|
|
+// temp.add(contractManagementInfo);
|
|
|
+// contractManagementInfo = new ContractManagementInfo();
|
|
|
+// contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
+// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+// .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos = new ArrayList<>();
|
|
|
+// tranCarInfos1 = new ArrayList<>();
|
|
|
+// tranCarInfos2 = new ArrayList<>();
|
|
|
+// contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
+// tranCarInfos.add(tranCarInfo);
|
|
|
+// } else if (i == tranCarInfoLists.size() - 1) {
|
|
|
+// tranCarInfos.add(tranCarInfo);
|
|
|
+// contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
+// temp.add(contractManagementInfo);
|
|
|
+// } else {
|
|
|
+// tranCarInfos.add(tranCarInfo);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if("1".equals(tranCarInfo.getFleetFlag())&&"4".equals(tranCarInfo.getTranType())&&"汽运".equals(tranCarInfo.getThreeTranType())) {
|
|
|
+// if (i == 0) {
|
|
|
+// contractManagementInfo = new ContractManagementInfo();
|
|
|
+// contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
+// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+// .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos = new ArrayList<>();
|
|
|
+// tranCarInfos1 = new ArrayList<>();
|
|
|
+// tranCarInfos2 = new ArrayList<>();
|
|
|
+// contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
+// tranCarInfos1.add(tranCarInfo);
|
|
|
+// } else if (!tranCarInfo.getContractId().equals(tranCarInfoLists.get(i - 1).getContractId())) {
|
|
|
+// contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
+// contractManagementInfo.setTranCarInfoList1(tranCarInfos1);
|
|
|
+// contractManagementInfo.setShipInfoList(tranCarInfos2);
|
|
|
+// temp.add(contractManagementInfo);
|
|
|
+// contractManagementInfo = new ContractManagementInfo();
|
|
|
+// contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
+// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+// .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos = new ArrayList<>();
|
|
|
+// tranCarInfos1 = new ArrayList<>();
|
|
|
+// tranCarInfos2 = new ArrayList<>();
|
|
|
+// contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
+// tranCarInfos.add(tranCarInfo);
|
|
|
+// } else if (i == tranCarInfoLists.size() - 1) {
|
|
|
+// tranCarInfos1.add(tranCarInfo);
|
|
|
+// contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
+// temp.add(contractManagementInfo);
|
|
|
+// } else {
|
|
|
+// tranCarInfos1.add(tranCarInfo);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// if("3".equals(tranCarInfo.getTranType())||"散船".equals(tranCarInfo.getThreeTranType())) {
|
|
|
+// if (i == 0) {
|
|
|
+// contractManagementInfo = new ContractManagementInfo();
|
|
|
+// contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
+// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+// .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos = new ArrayList<>();
|
|
|
+// tranCarInfos1 = new ArrayList<>();
|
|
|
+// tranCarInfos2 = new ArrayList<>();
|
|
|
+// contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
+// tranCarInfos2.add(tranCarInfo);
|
|
|
+// } else if (!tranCarInfo.getContractId().equals(tranCarInfoLists.get(i - 1).getContractId())) {
|
|
|
+// contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
+// contractManagementInfo.setTranCarInfoList1(tranCarInfos1);
|
|
|
+// contractManagementInfo.setShipInfoList(tranCarInfos2);
|
|
|
+// temp.add(contractManagementInfo);
|
|
|
+// contractManagementInfo = new ContractManagementInfo();
|
|
|
+// contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
+// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+// .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
+// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+// contractManagementInfo.setInOutType("采购入库");
|
|
|
+// tranCarInfos = new ArrayList<>();
|
|
|
+// tranCarInfos1 = new ArrayList<>();
|
|
|
+// tranCarInfos2 = new ArrayList<>();
|
|
|
+// contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
+// tranCarInfos2.add(tranCarInfo);
|
|
|
+// } else if (i == tranCarInfoLists.size() - 1) {
|
|
|
+// tranCarInfos2.add(tranCarInfo);
|
|
|
+// contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
+// temp.add(contractManagementInfo);
|
|
|
+// } else {
|
|
|
+// tranCarInfos2.add(tranCarInfo);
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
- if (contractManagementInfo.getUnitContractPrice() != null) {
|
|
|
- //期货取点价，现货取单价
|
|
|
- contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
+
|
|
|
+/*****************************************************---------------------------******************************/
|
|
|
+ List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
+ .eq("comp_id", compId)
|
|
|
+ .eq("delete_flag", "0")
|
|
|
+ .eq("contract_type", "2")
|
|
|
+ .eq("status_flag", "1")
|
|
|
+ .eq("deliver_type", "2")
|
|
|
+ .orderBy("update_date", false));
|
|
|
+ for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
|
|
|
+ ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
+ .eq("contract_id", contractManagementInfo.getId()));
|
|
|
+ //查合同下的车牌号,入库只能查到未提交的
|
|
|
+ List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
+ .eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
+ .eq("fleet_flag", "0").eq("tran_type", "4").eq("three_tran_type", "汽运").ne("submit", "2")
|
|
|
+ .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
|
|
|
+ if (!CollectionUtils.isEmpty(tranCarInfoList)) {
|
|
|
+ contractManagementInfo.setTranCarInfoList(tranCarInfoList);
|
|
|
}
|
|
|
- if("0".equals(tranCarInfo.getFleetFlag())&&"4".equals(tranCarInfo.getTranType())&&"汽运".equals(tranCarInfo.getThreeTranType())&&"2".equals(tranCarInfo.getSubmit())) {
|
|
|
- if (i == 0) {
|
|
|
- contractManagementInfo = new ContractManagementInfo();
|
|
|
- contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
- ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
- .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos = new ArrayList<>();
|
|
|
- tranCarInfos1 = new ArrayList<>();
|
|
|
- tranCarInfos2 = new ArrayList<>();
|
|
|
- contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos.add(tranCarInfo);
|
|
|
- } else if (!tranCarInfo.getContractId().equals(tranCarInfoLists.get(i - 1).getContractId())) {
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
- contractManagementInfo.setTranCarInfoList1(tranCarInfos1);
|
|
|
- contractManagementInfo.setShipInfoList(tranCarInfos2);
|
|
|
- temp.add(contractManagementInfo);
|
|
|
- contractManagementInfo = new ContractManagementInfo();
|
|
|
- contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
- ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
- .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos = new ArrayList<>();
|
|
|
- tranCarInfos1 = new ArrayList<>();
|
|
|
- tranCarInfos2 = new ArrayList<>();
|
|
|
- contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
- tranCarInfos.add(tranCarInfo);
|
|
|
- } else if (i == tranCarInfoLists.size() - 1) {
|
|
|
- tranCarInfos.add(tranCarInfo);
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
- temp.add(contractManagementInfo);
|
|
|
- } else {
|
|
|
- tranCarInfos.add(tranCarInfo);
|
|
|
- }
|
|
|
+ //查合同下的车队,入库只能查到未提交的
|
|
|
+ List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
+ .eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
+ .eq("fleet_flag", "1").eq("tran_type", "4").eq("three_tran_type", "汽运")
|
|
|
+ .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
|
|
|
+ if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
|
|
|
+ contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
|
|
|
}
|
|
|
- if("1".equals(tranCarInfo.getFleetFlag())&&"4".equals(tranCarInfo.getTranType())&&"汽运".equals(tranCarInfo.getThreeTranType())) {
|
|
|
- if (i == 0) {
|
|
|
- contractManagementInfo = new ContractManagementInfo();
|
|
|
- contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
- ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
- .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos = new ArrayList<>();
|
|
|
- tranCarInfos1 = new ArrayList<>();
|
|
|
- tranCarInfos2 = new ArrayList<>();
|
|
|
- contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
- tranCarInfos1.add(tranCarInfo);
|
|
|
- } else if (!tranCarInfo.getContractId().equals(tranCarInfoLists.get(i - 1).getContractId())) {
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
- contractManagementInfo.setTranCarInfoList1(tranCarInfos1);
|
|
|
- contractManagementInfo.setShipInfoList(tranCarInfos2);
|
|
|
- temp.add(contractManagementInfo);
|
|
|
- contractManagementInfo = new ContractManagementInfo();
|
|
|
- contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
- ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
- .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos = new ArrayList<>();
|
|
|
- tranCarInfos1 = new ArrayList<>();
|
|
|
- tranCarInfos2 = new ArrayList<>();
|
|
|
- contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
- tranCarInfos.add(tranCarInfo);
|
|
|
- } else if (i == tranCarInfoLists.size() - 1) {
|
|
|
- tranCarInfos1.add(tranCarInfo);
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
- temp.add(contractManagementInfo);
|
|
|
- } else {
|
|
|
- tranCarInfos1.add(tranCarInfo);
|
|
|
- }
|
|
|
+ //查船名
|
|
|
+ Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
|
|
|
+ shipListWrapper.eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
+ .eq("delete_flag", "0");
|
|
|
+ shipListWrapper.andNew().eq("tran_type", "3").or()
|
|
|
+ .eq("three_tran_type", "散船");
|
|
|
+ List<TranCarInfo> shipInfoList = tranCarInfoService.selectList(shipListWrapper);
|
|
|
+ if (!CollectionUtils.isEmpty(shipInfoList)) {
|
|
|
+ contractManagementInfo.setShipInfoList(shipInfoList);
|
|
|
}
|
|
|
- if("3".equals(tranCarInfo.getTranType())||"散船".equals(tranCarInfo.getThreeTranType())) {
|
|
|
- if (i == 0) {
|
|
|
- contractManagementInfo = new ContractManagementInfo();
|
|
|
- contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
- ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
- .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos = new ArrayList<>();
|
|
|
- tranCarInfos1 = new ArrayList<>();
|
|
|
- tranCarInfos2 = new ArrayList<>();
|
|
|
- contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
- tranCarInfos2.add(tranCarInfo);
|
|
|
- } else if (!tranCarInfo.getContractId().equals(tranCarInfoLists.get(i - 1).getContractId())) {
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
- contractManagementInfo.setTranCarInfoList1(tranCarInfos1);
|
|
|
- contractManagementInfo.setShipInfoList(tranCarInfos2);
|
|
|
- temp.add(contractManagementInfo);
|
|
|
- contractManagementInfo = new ContractManagementInfo();
|
|
|
- contractManagementInfo = contractManagementInfoService.selectById(tranCarInfo.getContractId());
|
|
|
- ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
- .eq("contract_id", tranCarInfo.getContractId()));
|
|
|
- contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
- contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
- contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
- contractManagementInfo.setInOutType("采购入库");
|
|
|
- tranCarInfos = new ArrayList<>();
|
|
|
- tranCarInfos1 = new ArrayList<>();
|
|
|
- tranCarInfos2 = new ArrayList<>();
|
|
|
- contractManagementInfo.setId(tranCarInfo.getId());
|
|
|
- tranCarInfos2.add(tranCarInfo);
|
|
|
- } else if (i == tranCarInfoLists.size() - 1) {
|
|
|
- tranCarInfos2.add(tranCarInfo);
|
|
|
- contractManagementInfo.setTranCarInfoList(tranCarInfos);
|
|
|
- temp.add(contractManagementInfo);
|
|
|
- } else {
|
|
|
- tranCarInfos2.add(tranCarInfo);
|
|
|
- }
|
|
|
+ contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
+ contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
+ contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
+ contractManagementInfo.setInOutType("采购入库");
|
|
|
+ if (contractManagementInfo.getUnitContractPrice() != null) {
|
|
|
+ //期货取点价，现货取单价
|
|
|
+ contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
}
|
|
|
+ temp.add(contractManagementInfo);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-/*****************************************************---------------------------******************************/
|
|
|
-// List<ContractManagementInfo> contractManagementInfoList = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
-// .eq("comp_id", compId)
|
|
|
-// .eq("delete_flag", "0")
|
|
|
-// .eq("contract_type", "2")
|
|
|
-// .eq("status_flag", "1")
|
|
|
-// .eq("deliver_type", "2")
|
|
|
-// .orderBy("update_date", false));
|
|
|
-// for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
|
|
|
-// ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
|
|
|
-// .eq("contract_id", contractManagementInfo.getId()));
|
|
|
-// //查合同下的车牌号,入库只能查到未提交的
|
|
|
-// List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
-// .eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
-// .eq("fleet_flag", "0").eq("tran_type", "4").eq("three_tran_type", "汽运").ne("submit", "2")
|
|
|
-// .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
|
|
|
-// if (!CollectionUtils.isEmpty(tranCarInfoList)) {
|
|
|
-// contractManagementInfo.setTranCarInfoList(tranCarInfoList);
|
|
|
-// }
|
|
|
-// //查合同下的车队,入库只能查到未提交的
|
|
|
-// List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
|
|
|
-// .eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
-// .eq("fleet_flag", "1").eq("tran_type", "4").eq("three_tran_type", "汽运")
|
|
|
-// .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
|
|
|
-// if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
|
|
|
-// contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
|
|
|
-// }
|
|
|
-// //查船名
|
|
|
-// Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
|
|
|
-// shipListWrapper.eq("contract_no", contractManagementInfo.getContractNo())
|
|
|
-// .eq("delete_flag", "0");
|
|
|
-// shipListWrapper.andNew().eq("tran_type", "3").or()
|
|
|
-// .eq("three_tran_type", "散船");
|
|
|
-// List<TranCarInfo> shipInfoList = tranCarInfoService.selectList(shipListWrapper);
|
|
|
-// if (!CollectionUtils.isEmpty(shipInfoList)) {
|
|
|
-// contractManagementInfo.setShipInfoList(shipInfoList);
|
|
|
-// }
|
|
|
-// contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
|
|
|
-// contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
|
|
|
-// contractManagementInfo.setGrade(contractGoodsInfo.getGrade());
|
|
|
-// contractManagementInfo.setInOutType("采购入库");
|
|
|
-// if (contractManagementInfo.getUnitContractPrice() != null) {
|
|
|
-// //期货取点价，现货取单价
|
|
|
-// contractManagementInfo.setContractPrice(contractManagementInfo.getPointPrice() != null ? contractManagementInfo.getPointPrice() : Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
|
|
|
-// }
|
|
|
-// temp.add(contractManagementInfo);
|
|
|
-// }
|
|
|
List<ContractManagementInfo> contractManagementInfoList1 = contractManagementInfoService.selectList(new EntityWrapper<ContractManagementInfo>()
|
|
|
.eq("comp_id", compId)
|
|
|
.eq("status_flag", "1")
|
