Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/BasicPortDesc.java

@@ -1,5 +1,6 @@
 package org.springblade.client.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -74,5 +75,7 @@ public class BasicPortDesc  extends TenantEntity implements Serializable {
 	//创建部门
 	private Long createDept;
 
+	@TableField(exist = false)
+	private String typeName;
 
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/constant/LandConst.java

@@ -39,6 +39,6 @@ public interface LandConst {
 
 	String MOLD_SH = "散货";
 
-	String MOLD_TZ = "特种车辆";
+	String MOLD_TZ = "特种运输";
 
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/Order.java

@@ -59,8 +59,8 @@ public class Order implements Serializable {
 	 * 业务日期
 	 */
 	@ApiModelProperty(value = "业务日期")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date bsDate;
 	/**
 	 * 业务类型
@@ -247,6 +247,9 @@ public class Order implements Serializable {
 	private String corpName;
 
 	@TableField(exist = false)
+	private String corpShortName;
+
+	@TableField(exist = false)
 	private String salesmanName;
 
 	@TableField(exist = false)

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/OrderFee.java

@@ -179,6 +179,9 @@ public class OrderFee implements Serializable {
 	private String corpName;
 
 	@TableField(exist = false)
+	private String corpShortName;
+
+	@TableField(exist = false)
 	private String confirmUserName;
 
 	@TableField(exist = false)

blade-service-api/blade-land-api/src/main/java/org/springblade/land/entity/OrderItem.java

@@ -351,9 +351,15 @@ public class OrderItem implements Serializable {
 	private String corpName;
 
 	@TableField(exist = false)
+	private String corpShortName;
+
+	@TableField(exist = false)
 	private String fleetName;
 
 	@TableField(exist = false)
+	private String fleetShortName;
+
+	@TableField(exist = false)
 	private String driverName;
 
 	@TableField(exist = false)

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/AcctExcel.java

@@ -1,46 +0,0 @@
-package org.springblade.land.excel;
-
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.format.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class AcctExcel implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@ExcelProperty("客户名称")
-	private String corpName;
-
-	@ExcelProperty("货运日期")
-	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
-	private Date arrivalTime;
-
-	@ExcelProperty("业务员")
-	private String salesmanName;
-
-	@ExcelProperty("货运地点")
-	private String addressDetail;
-
-	@ExcelProperty("票据号")
-	private String receiptNo;
-
-	@ExcelProperty("提单号")
-	private String billNo;
-
-	@ExcelProperty("场站")
-	private String station;
-
-	@ExcelProperty("尺寸箱型")
-	private String ctnDetail;
-
-	@ExcelProperty("车队")
-	private String fleetName;
-
-	@ExcelProperty("车号")
-	private String plateNo;
-
-	@ExcelProperty("备注")
-	private String remarks;
-
-}

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/CdAcctExcel.java

@@ -1,20 +1,60 @@
 package org.springblade.land.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-@EqualsAndHashCode(callSuper = true)
-public class CdAcctExcel extends AcctExcel {
+public class CdAcctExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpName;
+
+	@ExcelProperty("客户简称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("尺寸箱型")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetName;
+
+	@ExcelProperty("车队简称")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
 
 	@ExcelProperty("运费")
 	private BigDecimal landAmountC;
@@ -22,4 +62,7 @@ public class CdAcctExcel extends AcctExcel {
 	@ExcelProperty("杂费")
 	private BigDecimal extraAmountC;
 
+	@ExcelProperty("备注")
+	private String remarks;
+
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/KhAcctExcel.java

@@ -1,20 +1,60 @@
 package org.springblade.land.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-@EqualsAndHashCode(callSuper = true)
-public class KhAcctExcel extends AcctExcel {
+public class KhAcctExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpName;
+
+	@ExcelProperty("客户简称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("尺寸箱型")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetName;
+
+	@ExcelProperty("车队简称")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
 
 	@ExcelProperty("运费")
 	private BigDecimal landAmountD;
@@ -22,4 +62,7 @@ public class KhAcctExcel extends AcctExcel {
 	@ExcelProperty("杂费")
 	private BigDecimal extraAmountD;
 
+	@ExcelProperty("备注")
+	private String remarks;
+
 }

blade-service-api/blade-land-api/src/main/java/org/springblade/land/excel/PtAcctExcel.java

@@ -1,20 +1,60 @@
 package org.springblade.land.excel;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 @ColumnWidth(25)
 @HeadRowHeight(20)
 @ContentRowHeight(18)
-@EqualsAndHashCode(callSuper = true)
-public class PtAcctExcel extends AcctExcel {
+public class PtAcctExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty("客户名称")
+	private String corpName;
+
+	@ExcelProperty("客户简称")
+	private String corpShortName;
+
+	@ExcelProperty("货运日期")
+	@DateTimeFormat("yyyy-MM-dd HH:mm:ss")
+	private Date arrivalTime;
+
+	@ExcelProperty("业务员")
+	private String salesmanName;
+
+	@ExcelProperty("货运地点")
+	private String addressDetail;
+
+	@ExcelProperty("票据号")
+	private String receiptNo;
+
+	@ExcelProperty("提单号")
+	private String billNo;
+
+	@ExcelProperty("场站")
+	private String station;
+
+	@ExcelProperty("尺寸箱型")
+	private String ctnDetail;
+
+	@ExcelProperty("车队")
+	private String fleetName;
+
+	@ExcelProperty("车队简称")
+	private String fleetShortName;
+
+	@ExcelProperty("车号")
+	private String plateNo;
 
 	@ExcelProperty("应付运费")
 	private BigDecimal landAmountC;
@@ -31,4 +71,7 @@ public class PtAcctExcel extends AcctExcel {
 	@ExcelProperty("利润")
 	private BigDecimal profit;
 
+	@ExcelProperty("备注")
+	private String remarks;
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/corps/controller/CorpsDescController.java

@@ -1,6 +1,5 @@
 package org.springblade.client.corps.controller;
 
-import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
@@ -103,6 +102,18 @@ public class CorpsDescController extends BladeController {
 					CorpsDesc desc = corpsDescService.getById(item.getBelongtocompany());
 					item.setBelongCompany(desc.getCname());
 				}
+
+				List<Long> typeIdList = corpsTypeDescService.list(new LambdaQueryWrapper<CorpsTypeDesc>().eq(CorpsTypeDesc::getCorpId, item.getId()))
+					.stream().map(CorpsTypeDesc::getCorpTypeId).collect(Collectors.toList());
+
+				if (CollectionUtil.isNotEmpty(typeIdList)) {
+					String typeName = corpsTypeService.list(new LambdaQueryWrapper<CorpsType>()
+						.in(CorpsType::getId, typeIdList)
+						.eq(CorpsType::getCorpType, item.getCorpType())
+						.eq(CorpsType::getIsDeleted, 0)
+					).stream().map(CorpsType::getCname).collect(Collectors.joining(","));
+					item.setCorpsTypeName(typeName);
+				}
 			});
 		}
 		return R.data(pages);

blade-service/blade-client/src/main/java/org/springblade/client/port/controller/PortController.java

@@ -3,57 +3,45 @@ package org.springblade.client.port.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.ApiOperation;
-import io.undertow.attribute.SubstituteEmptyWrapper;
 import lombok.AllArgsConstructor;
-import lombok.Data;
-import oracle.jdbc.proxy.annotation.Post;
 import org.apache.commons.lang.StringUtils;
-import org.springblade.client.container.service.BasicContainerDescService;
-import org.springblade.client.container.service.BasicContainerTypeService;
 import org.springblade.client.dto.BasicPortDescDTO;
-import org.springblade.client.entity.BasicContainerType;
 import org.springblade.client.entity.BasicPortDesc;
 import org.springblade.client.entity.BasicPortType;
-import org.springblade.client.goods.enums.GoodsTypeEnum;
+import org.springblade.client.entity.BasicPortTypeDesc;
 import org.springblade.client.port.service.BasicPortDescService;
 import org.springblade.client.port.service.BasicPortTypeDescService;
 import org.springblade.client.port.service.BasicPortTypeService;
-import org.springblade.client.vo.GoodsTypeVO;
 import org.springblade.client.vo.PortTypeVO;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @NonDS
 @ApiIgnore
 @RestController
-@RequestMapping("/port")
 @AllArgsConstructor
-public class PortController
-{
-    @Autowired
-	private BasicPortDescService basicPortDescService;
-    @Autowired
-	private BasicPortTypeService basicPortTypeService;
-    @Autowired
-	private BasicPortTypeDescService midBasicPortTypeDescService;
-    @Autowired
-	private BasicContainerDescService basicContainerDescService;
-    @Autowired
-	private BasicContainerTypeService basicContainerTypeService;
+@RequestMapping("/port")
+
+public class PortController {
+
+	private final BasicPortDescService basicPortDescService;
+
+	private final BasicPortTypeService basicPortTypeService;
+
+	private final BasicPortTypeDescService basicPortTypeDescService;
 
 	@GetMapping("list")
 	public R list(@RequestParam(name = "current", defaultValue = "1") Integer current,
@@ -63,27 +51,24 @@ public class PortController
 				  @RequestParam(name = "unCode", required = false) String unCode,
 				  @RequestParam(name = "typeId", required = false) Long typeId,
 				  @RequestParam(name = "status", required = false) String status,
-				  @RequestParam(name = "enName",required = false) String enName)
-	{
-		Page<BasicPortDescDTO> page=new Page<>(current,size);
-		IPage<BasicPortDescDTO> iPage = basicPortDescService.listBasicPortDesc(page, name, lines, unCode, status,typeId,AuthUtil.getTenantId(),enName);
+				  @RequestParam(name = "enName", required = false) String enName) {
+		Page<BasicPortDescDTO> page = new Page<>(current, size);
+		IPage<BasicPortDescDTO> iPage = basicPortDescService.listBasicPortDesc(page, name, lines, unCode, status, typeId, AuthUtil.getTenantId(), enName);
 		return R.data(iPage);
 	}
 
-    @PostMapping("add")
-	public R add (@RequestBody BasicPortDescDTO dto)
-	{
+	@PostMapping("add")
+	public R add(@RequestBody BasicPortDescDTO dto) {
 		dto.setTenantId(AuthUtil.getTenantId());
 		dto.setCreateTime(new Date());
 		dto.setCreateUser(SecureUtil.getUserId());
 		dto.setCreateUserName(SecureUtil.getUser().getUserName());
 		basicPortDescService.addBasicPortDesc(dto);
-        return R.success("操作成功");
+		return R.success("操作成功");
 	}
 
 	@PutMapping("edit")
-	public R edit( @RequestBody BasicPortDescDTO body )
-	{
+	public R edit(@RequestBody BasicPortDescDTO body) {
 		body.setUpdateTime(new Date());
 		body.setUpdateUser(SecureUtil.getUserId());
 		body.setUpdateUserName(SecureUtil.getUser().getUserName());
@@ -92,9 +77,8 @@ public class PortController
 	}
 
 	@DeleteMapping("delete")
-    public R delete(@RequestParam(name = "id", required = true) Long id)
-	{
-		List<Long> ids= Arrays.asList(id);
+	public R delete(@RequestParam(name = "id", required = true) Long id) {
+		List<Long> ids = Arrays.asList(id);
 		basicPortDescService.deleteLogic(ids);
 		return R.success("操作成功");
 	}
@@ -102,28 +86,25 @@ public class PortController
 	@GetMapping("type/list")
 	public R typeList(@RequestParam(name = "current", defaultValue = "1") Integer current,
 					  @RequestParam(name = "size", defaultValue = "10") Integer size,
-					  @RequestParam(name = "portName", required = false) String portName ,
+					  @RequestParam(name = "portName", required = false) String portName,
 					  @RequestParam(name = "status", required = false) Integer status,
-					  @RequestParam(name = "parentId", required = false) Long parentId)
-
-	{
-		LambdaQueryWrapper<BasicPortType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();
+					  @RequestParam(name = "parentId", required = false) Long parentId) {
+		LambdaQueryWrapper<BasicPortType> typeLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		typeLambdaQueryWrapper
-			.eq(BasicPortType::getTenantId,AuthUtil.getTenantId())
-			.like(StringUtils.isNotBlank(portName),BasicPortType::getName,portName)
-			.eq(status!=null,BasicPortType::getStatus,status)
-			.eq(parentId!=null,BasicPortType::getParentId,parentId)
-		    .orderByDesc(BasicPortType::getCreateTime);
-		Page<BasicPortType> page=new Page<>(current,size);
-		IPage<BasicPortType> iPage=basicPortTypeService.page(page,typeLambdaQueryWrapper);
+			.eq(BasicPortType::getTenantId, AuthUtil.getTenantId())
+			.like(StringUtils.isNotBlank(portName), BasicPortType::getName, portName)
+			.eq(status != null, BasicPortType::getStatus, status)
+			.eq(parentId != null, BasicPortType::getParentId, parentId)
+			.orderByDesc(BasicPortType::getCreateTime);
+		Page<BasicPortType> page = new Page<>(current, size);
+		IPage<BasicPortType> iPage = basicPortTypeService.page(page, typeLambdaQueryWrapper);
 		List<BasicPortType> records = iPage.getRecords();
-		if(!CollectionUtils.isEmpty(records))
-		{
-			records.forEach(e->{
-				LambdaQueryWrapper<BasicPortType> basicPortTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
-				basicPortTypeLambdaQueryWrapper.eq(BasicPortType::getParentId,e.getId());
+		if (!CollectionUtils.isEmpty(records)) {
+			records.forEach(e -> {
+				LambdaQueryWrapper<BasicPortType> basicPortTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				basicPortTypeLambdaQueryWrapper.eq(BasicPortType::getParentId, e.getId());
 				int count = basicPortTypeService.count(basicPortTypeLambdaQueryWrapper);
-				e.setHasChildren(count>0?true:false);
+				e.setHasChildren(count > 0);
 			});
 		}
 
@@ -131,27 +112,24 @@ public class PortController
 	}
 
 	@GetMapping("getPortTypeList")
-	public List<BasicPortType> getPortTypeList( @RequestParam(name = "pid", required = false) Long pid)
-	{
-		LambdaQueryWrapper<BasicPortType> lambdaQueryWrapper=new LambdaQueryWrapper<>();
-		lambdaQueryWrapper.eq(pid!=null,BasicPortType::getParentId,pid);
-		lambdaQueryWrapper.eq(BasicPortType::getTenantId,AuthUtil.getTenantId());
+	public List<BasicPortType> getPortTypeList(@RequestParam(name = "pid", required = false) Long pid) {
+		LambdaQueryWrapper<BasicPortType> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(pid != null, BasicPortType::getParentId, pid);
+		lambdaQueryWrapper.eq(BasicPortType::getTenantId, AuthUtil.getTenantId());
 		List<BasicPortType> typeList = basicPortTypeService.list(lambdaQueryWrapper);
-		if(!CollectionUtils.isEmpty(typeList))
-		{
-			typeList.forEach(e->{
-				LambdaQueryWrapper<BasicPortType> basicPortTypeLambdaQueryWrapper=new LambdaQueryWrapper<>();
-				basicPortTypeLambdaQueryWrapper.eq(BasicPortType::getParentId,e.getId());
+		if (!CollectionUtils.isEmpty(typeList)) {
+			typeList.forEach(e -> {
+				LambdaQueryWrapper<BasicPortType> basicPortTypeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+				basicPortTypeLambdaQueryWrapper.eq(BasicPortType::getParentId, e.getId());
 				int count = basicPortTypeService.count(basicPortTypeLambdaQueryWrapper);
-				e.setHasChildren(count>0?true:false);
+				e.setHasChildren(count > 0);
 			});
 		}
 		return typeList;
 	}
 
 	@PostMapping("type/add")
-	public R typeList(@RequestBody BasicPortType portType )
-	{
+	public R typeList(@RequestBody BasicPortType portType) {
 		portType.setTenantId(AuthUtil.getTenantId());
 		portType.setCreateTime(new Date());
 		portType.setCreateUser(SecureUtil.getUserId());
@@ -161,8 +139,7 @@ public class PortController
 	}
 
 	@PutMapping("type/edit")
-	public R typeEdit(@RequestBody BasicPortType portType)
-	{
+	public R typeEdit(@RequestBody BasicPortType portType) {
 		portType.setUpdateTime(new Date());
 		portType.setUpdateUser(SecureUtil.getUserId());
 		portType.setUpdateUserName(SecureUtil.getUser().getUserName());
@@ -171,17 +148,15 @@ public class PortController
 	}
 
 	@DeleteMapping("type/delete")
-	public R  typeDelet(@RequestParam(name = "id", required = true) Long id)
-	{
-		LambdaQueryWrapper<BasicPortType> typeLambdaQueryWrapper=new LambdaQueryWrapper<>();
-		typeLambdaQueryWrapper.eq(BasicPortType::getParentId,id);
-		int count=basicPortTypeService.count(typeLambdaQueryWrapper);
-		if(count>0)
-		{
+	public R typeDelet(@RequestParam(name = "id", required = true) Long id) {
+		LambdaQueryWrapper<BasicPortType> typeLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		typeLambdaQueryWrapper.eq(BasicPortType::getParentId, id);
+		int count = basicPortTypeService.count(typeLambdaQueryWrapper);
+		if (count > 0) {
 			throw new RuntimeException("存在子项无法删除");
 		}
 
-		List<Long> ids= Arrays.asList(id);
+		List<Long> ids = Arrays.asList(id);
 		basicPortTypeService.deleteLogic(ids);
 		return R.success("操作成功");
 	}
@@ -195,28 +170,45 @@ public class PortController
 	}
 
 	@GetMapping("listPort")
-	public List<Map<String,Object>> listPort()
-	{
-		List<Map<String,Object>> result=new ArrayList<>();
+	public List<Map<String, Object>> listPort() {
+		List<Map<String, Object>> result = new ArrayList<>();
 		List<BasicPortDesc> list = basicPortDescService.list();
-		if(!CollectionUtils.isEmpty(list))
-		{
-			list.forEach(e->{
-                Map<String,Object> model=new HashMap();
-				model.put("id",e.getId());
-				model.put("name",e.getName());
+		if (!CollectionUtils.isEmpty(list)) {
+			list.forEach(e -> {
+				Map<String, Object> model = new HashMap<>();
+				model.put("id", e.getId());
+				model.put("name", e.getName());
 				result.add(model);
 			});
 		}
 		return result;
 	}
+
 	@GetMapping("/portList")
-	public R<List<BasicPortDesc>> portList(BasicPortDesc basicPortDesc){
+	public R<List<BasicPortDesc>> portList(BasicPortDesc basicPortDesc) {
 		basicPortDesc.setIsDeleted(0);
 		basicPortDesc.setTenantId(SecureUtil.getTenantId());
-		return R.data(basicPortDescService.list(new QueryWrapper<BasicPortDesc>().setEntity(basicPortDesc)));
-	}
+		QueryWrapper<BasicPortDesc> queryWrapper = new QueryWrapper<BasicPortDesc>().setEntity(basicPortDesc);
+
+		if (StringUtil.isNotBlank(basicPortDesc.getTypeName())) {
+			List<Long> typeIdList = basicPortTypeService.list(new LambdaQueryWrapper<BasicPortType>()
+				.select(BasicPortType::getId)
+				.eq(BasicPortType::getName, basicPortDesc)
+				.eq(BasicPortType::getTenantId, AuthUtil.getTenantId())
+				.eq(BasicPortType::getIsDeleted, 0)
+			).stream().map(BasicPortType::getId).collect(Collectors.toList());
+
+			List<Long> descIdList = basicPortTypeDescService.list(new LambdaQueryWrapper<BasicPortTypeDesc>()
+				.select(BasicPortTypeDesc::getPortsId)
+				.in(BasicPortTypeDesc::getPortsTypeId, typeIdList)
+				.eq(BasicPortTypeDesc::getIsDeleted, 0)
+			).stream().map(BasicPortTypeDesc::getPortsId).collect(Collectors.toList());
+
+			queryWrapper.in("id", descIdList);
+		}
 
+		return R.data(basicPortDescService.list(queryWrapper));
+	}
 
 
 }

blade-service/blade-land/src/main/java/org/springblade/land/controller/OrderIndexController.java

@@ -148,7 +148,7 @@ public class OrderIndexController extends BladeController {
 	@ApiOperation(value = "业务统计")
 	public R bizCount(Integer mold) {
 		LambdaQueryWrapper<OrderItem> wrapper = new LambdaQueryWrapper<OrderItem>()
-			.between(OrderItem::getCreateTime, getTime(true), getTime(false))
+			.between(OrderItem::getArrivalTime, getTime(true), getTime(false))
 			.eq(OrderItem::getKind, 2)
 			.eq(OrderItem::getIsDeleted, 0)
 			.eq(OrderItem::getTenantId, AuthUtil.getTenantId());
@@ -191,6 +191,7 @@ public class OrderIndexController extends BladeController {
 		mapTemp = new HashMap<>();
 		mapTemp.put("name", "未运行");
 		mapTemp.put("value", inactive);
+		mapTemp.put("mold", mold);
 		tableTemp.add(mapTemp);
 
 		// 运行中
@@ -198,6 +199,7 @@ public class OrderIndexController extends BladeController {
 		mapTemp = new HashMap<>();
 		mapTemp.put("name", "运行中");
 		mapTemp.put("value", active);
+		mapTemp.put("mold", mold);
 		tableTemp.add(mapTemp);
 
 		// 已完成
@@ -205,6 +207,7 @@ public class OrderIndexController extends BladeController {
 		mapTemp = new HashMap<>();
 		mapTemp.put("name", "已完成");
 		mapTemp.put("value", finish);
+		mapTemp.put("mold", mold);
 		tableTemp.add(mapTemp);
 
 		table.put("all", all);
@@ -221,8 +224,8 @@ public class OrderIndexController extends BladeController {
 	@ApiOperation(value = "业务详情")
 	public R bizDetail(Integer mold, Integer status) {
 		OrderAcctVO acctVO = new OrderAcctVO();
-		acctVO.setBeginCreateTime(getTime(true));
-		acctVO.setEndCreateTime(getTime(false));
+		acctVO.setBeginArrivalTime(getTime(true));
+		acctVO.setEndArrivalTime(getTime(false));
 		acctVO.setStatus(status);
 
 		// 获取角色

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -34,7 +34,7 @@
                t1.receipt_no as receiptNo,
                t1.bill_no as billNo,
                t1.station,
-               t2.ctn_type as ctnDetail,
+               concat(t2.ctn_type, '×', sum(t2.ctn_quantity)) as ctnDetail,
                t4.cname as fleetName,
                t4.short_name as fleetShortName,
                t2.plate_no,
@@ -64,8 +64,6 @@
             <if test="acct.beginArrivalTime != null and acct.beginArrivalTime != ''">and t2.arrival_time &gt;= #{acct.beginArrivalTime}</if>
             <if test="acct.endArrivalTime != null and acct.endArrivalTime != ''">and t2.arrival_time &lt;= #{acct.endArrivalTime}</if>
 
-            <if test="acct.beginCreateTime != null and acct.beginCreateTime != ''">and t2.create_time &gt;= #{acct.beginCreateTime}</if>
-            <if test="acct.endCreateTime != null and acct.endCreateTime != ''">and t2.create_time &lt;= #{acct.endCreateTime}</if>
             <if test="acct.salesman != null">and t1.salesman = #{acct.salesman}</if>
             <if test="acct.salesmanDeptList != null">and t1.salesman_dept in
                 <foreach item="dept" collection="acct.salesmanDeptList" open="(" separator="," close=")">

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderItemServiceImpl.java

@@ -143,7 +143,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 		long all = itemList.size();
 		long one = itemList.stream().filter(item -> item.getStatus() == 1).count();
 		long two = itemList.stream().filter(item -> item.getStatus() == 2).count();
-		long three = itemList.stream().filter(item -> item.getStatus() == 3).count();
+		long three = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 2 && item.getStatus() != 3).count();
 		long four = itemList.stream().filter(item -> item.getStatus() == 4).count();
 
 		Map<String, Object> data = new HashMap<>();
@@ -234,6 +234,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getFleetId());
 				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 					item.setFleetName(corpMessage.getData().getCname());
+					item.setFleetShortName(corpMessage.getData().getShortName());
 				}
 			}
 
@@ -533,6 +534,7 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(item.getFleetId());
 				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 					item.setFleetName(corpMessage.getData().getCname());
+					item.setFleetShortName(corpMessage.getData().getShortName());
 				}
 			}
 
@@ -647,7 +649,8 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			.eq(ObjectUtil.isNotEmpty(orderItem.getFleetId()), OrderItem::getFleetId, orderItem.getFleetId())
 			.eq(ObjectUtil.isNotEmpty(orderItem.getVehicleId()), OrderItem::getVehicleId, orderItem.getVehicleId())
 			.eq(ObjectUtil.isNotEmpty(orderItem.getDriverId()), OrderItem::getDriverId, orderItem.getDriverId())
-			.eq(ObjectUtil.isNotEmpty(orderItem.getStatus()), OrderItem::getStatus, orderItem.getStatus())
+			.eq(ObjectUtil.isNotEmpty(orderItem.getStatus()) && orderItem.getStatus() != 3, OrderItem::getStatus, orderItem.getStatus())
+			.notIn(ObjectUtil.isNotEmpty(orderItem.getStatus()) && orderItem.getStatus() == 3, OrderItem::getStatus, 0, 1, 2, 4)
 			.eq(StringUtil.isNotBlank(orderItem.getShippingMode()), OrderItem::getShippingMode, orderItem.getShippingMode())
 			.eq(OrderItem::getKind, 2)
 			.eq(OrderItem::getIsDeleted, 0)
@@ -667,12 +670,14 @@ public class OrderItemServiceImpl extends ServiceImpl<OrderItemMapper, OrderItem
 			R<CorpsDesc> corp = corpsDescClient.getCorpMessage(order.getCorpId());
 			if (corp.isSuccess() && corp.getData() != null) {
 				item.setCorpName(corp.getData().getCname());
+				item.setCorpShortName(corp.getData().getShortName());
 			}
 		}
 		if (ObjectUtil.isNotEmpty(item.getFleetId())) {
 			R<CorpsDesc> fleet = corpsDescClient.getCorpMessage(item.getFleetId());
 			if (fleet.isSuccess() && fleet.getData() != null) {
 				item.setFleetName(fleet.getData().getCname());
+				item.setFleetShortName(fleet.getData().getShortName());
 			}
 		}
 		if (ObjectUtil.isNotEmpty(item.getDriverId())) {

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -99,6 +99,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(detail.getCorpId());
 			if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 				detail.setCorpName(corpMessage.getData().getCname());
+				detail.setCorpShortName(corpMessage.getData().getShortName());
 			}
 		}
 
@@ -164,6 +165,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(orderFee.getCorpId());
 					if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 						orderFee.setCorpName(corpMessage.getData().getCname());
+						orderFee.setCorpShortName(corpMessage.getData().getShortName());
 					}
 				}
 				if (!ObjectUtil.isEmpty(orderFee.getFeeId())) {
@@ -194,7 +196,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (ObjectUtil.isNotEmpty(itemStatus)) {
 			orderIdList = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
 				.select(OrderItem::getOrderId)
-				.eq(itemStatus != 999, OrderItem::getStatus, itemStatus)
+				.eq(itemStatus != 999 && itemStatus != 3, OrderItem::getStatus, itemStatus)
+				.notIn(itemStatus == 3, OrderItem::getStatus, 0, 1, 2, 4)
 				.eq(itemStatus != 999, OrderItem::getKind, 2)
 				.eq(itemStatus == 999, OrderItem::getKind, 1)
 				.eq(OrderItem::getIsDeleted, 0)
@@ -236,6 +239,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(record.getCorpId());
 				if (corpMessage.isSuccess() && corpMessage.getData() != null) {
 					record.setCorpName(corpMessage.getData().getCname());
+					record.setCorpShortName(corpMessage.getData().getShortName());
 				}
 			}
 
@@ -286,7 +290,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 
 					// 已派
-					Map<String, Long> dispatchCtnMap = itemList.stream().filter(item -> item.getStatus() == 1).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
+					Map<String, Long> dispatchCtnMap = itemList.stream().filter(item -> item.getStatus() > 1).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
 					StringBuilder dispatchCtnDetail = new StringBuilder();
 					for (Map.Entry<String, Long> entry : dispatchCtnMap.entrySet()) {
 						dispatchCtnDetail.append(entry.getKey()).append("×").append(entry.getValue()).append(",");
@@ -296,7 +300,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					}
 
 					// 受理
-					Map<String, Long> sendCtnMap = itemList.stream().filter(item -> item.getStatus() == 2).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
+					Map<String, Long> sendCtnMap = itemList.stream().filter(item -> item.getStatus() > 2).collect(Collectors.groupingBy(OrderItem::getCtnType, Collectors.counting()));
 					StringBuilder sendCtnDetail = new StringBuilder();
 					for (Map.Entry<String, Long> entry : sendCtnMap.entrySet()) {
 						sendCtnDetail.append(entry.getKey()).append("×").append(entry.getValue()).append(",");
@@ -311,6 +315,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					long two = itemList.stream().filter(item -> item.getStatus() == 2).count();
 					long three = itemList.stream().filter(item -> item.getStatus() == 3).count();
 					long four = itemList.stream().filter(item -> item.getStatus() == 4).count();
+					long five = itemList.stream().filter(item -> item.getStatus() == 5).count();
+					long six = itemList.stream().filter(item -> item.getStatus() == 6).count();
 					String statusDetail = "";
 					if (zero > 0) {
 						statusDetail += "未调度(" + zero + ");";
@@ -327,6 +333,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					if (four > 0) {
 						statusDetail += "工单关闭(" + four + ");";
 					}
+					if (five > 0) {
+						statusDetail += "未到场(" + five + ");";
+					}
+					if (six > 0) {
+						statusDetail += "未提箱(" + six + ");";
+					}
 
 					if (StringUtil.isNotBlank(statusDetail)) {
 						record.setItemStatusDetail(statusDetail.substring(0, statusDetail.lastIndexOf(";")));
@@ -402,7 +414,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			zero = itemList.stream().filter(item -> item.getStatus() == 0).count();
 			one = itemList.stream().filter(item -> item.getStatus() == 1).count();
 			two = itemList.stream().filter(item -> item.getStatus() == 2).count();
-			three = itemList.stream().filter(item -> item.getStatus() == 3).count();
+			three = itemList.stream().filter(item -> item.getStatus() != 0 && item.getStatus() != 1 && item.getStatus() != 2 && item.getStatus() != 3).count();
 			four = itemList.stream().filter(item -> item.getStatus() == 4).count();
 		}
 
@@ -765,12 +777,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				orderAddressMapper.updateById(address);
 			}
 
-			if (StringUtil.isNotBlank(address.getAddress())) {
-				addressDetail.append(address.getSort()).append(".")
-					.append(address.getCorpName()).append("(")
-					.append(address.getContacts()).append(" ")
-					.append(address.getTel()).append(") ")
-					.append(address.getAddress()).append("\n");
+			if (StringUtil.isNotBlank(address.getCorpName())) {
+				addressDetail.append(address.getSort()).append(".").append(address.getCorpName()).append("(");
+
+				if (StringUtil.isNotBlank(address.getContacts())) {
+					addressDetail.append(address.getContacts());
+				}
+				if (StringUtil.isNotBlank(address.getTel())) {
+					addressDetail.append(" ").append(address.getTel());
+				}
+				if (StringUtil.isNotBlank(address.getAddress())) {
+					addressDetail.append(") ").append(address.getAddress()).append("\n");
+				} else {
+					addressDetail.append(") ").append("\n");
+				}
 			}
 		}