1.干线实体提交

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingEntity.java

@@ -102,11 +102,5 @@ public class TrunklineBillladingEntity extends TenantEntity {
 	/** 结算人名称 */
 	@ApiModelProperty(name = "结算人名称",notes = "")
 	private String settlementName ;
-	/** 备注 */
-	@ApiModelProperty(name = "备注",notes = "")
-	private String remark ;
-	/** 创建用户名称 */
-	@ApiModelProperty(name = "创建用户名称",notes = "")
-	private String createUserName ;
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingLineEntity.java

@@ -0,0 +1,56 @@
+package com.logpm.trunkline.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.tenant.mp.TenantEntity;
+
+@Data
+@TableName("logpm_trunkline_billlading_line")
+@ApiModel(value = "TrunklineBillladingLine对象", description = "干线提货线路表")
+@EqualsAndHashCode(callSuper = true)
+public class TrunklineBillladingLineEntity extends TenantEntity {
+
+	/** 预留1 */
+	@ApiModelProperty(name = "预留1",notes = "")
+	private String reserve1 ;
+	/** 预留2 */
+	@ApiModelProperty(name = "预留2",notes = "")
+	private String reserve2 ;
+	/** 预留3 */
+	@ApiModelProperty(name = "预留3",notes = "")
+	private String reserve3 ;
+	/** 预留4 */
+	@ApiModelProperty(name = "预留4",notes = "")
+	private String reserve4 ;
+	/** 预留5 */
+	@ApiModelProperty(name = "预留5",notes = "")
+	private String reserve5 ;
+	/** 仓库id */
+	@ApiModelProperty(name = "仓库id",notes = "")
+	private Long warehouseId ;
+	/** 仓库名称 */
+	@ApiModelProperty(name = "仓库名称",notes = "")
+	private String warehouseName ;
+	/** 提货单id */
+	@ApiModelProperty(name = "提货单id",notes = "")
+	private Long billladingId ;
+	/** 客户类型 1 工厂  2 商场 3装饰 4个人 */
+	@ApiModelProperty(name = "客户类型 1 工厂 2 商场 3装饰 4个人",notes = "")
+	private String clientType ;
+	/** 联系人 */
+	@ApiModelProperty(name = "联系人",notes = "")
+	private String linkMan ;
+	/** 联系电话 */
+	@ApiModelProperty(name = "联系电话",notes = "")
+	private String linkPhone ;
+	/** 联系人地址 */
+	@ApiModelProperty(name = "联系人地址",notes = "")
+	private String linkAddress ;
+	/** 排序 */
+	@ApiModelProperty(name = "排序",notes = "")
+	private Integer sort ;
+
+}

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingPackageEntity.java

@@ -37,5 +37,8 @@ public class TrunklineBillladingPackageEntity extends TenantEntity {
 	/** 包件码 */
 	@ApiModelProperty(name = "包件码",notes = "")
 	private String orderPackageCode ;
+	/** 提货单id */
+	@ApiModelProperty(name = "提货单id",notes = "")
+	private Long billladingId ;
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineBillladingWaybillEntity.java

@@ -7,17 +7,12 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
-import java.math.BigDecimal;
-
 @Data
 @TableName("logpm_trunkline_billlading_waybill")
 @ApiModel(value = "TrunklineBillladingWaybill对象", description = "提货运单关联表")
 @EqualsAndHashCode(callSuper = true)
 public class TrunklineBillladingWaybillEntity extends TenantEntity {
 
-	/** 预留1 */
-	@ApiModelProperty(name = "预留1",notes = "")
-	private String reserve1 ;
 	/** 预留2 */
 	@ApiModelProperty(name = "预留2",notes = "")
 	private String reserve2 ;
@@ -47,10 +42,10 @@ public class TrunklineBillladingWaybillEntity extends TenantEntity {
 	private Integer realNum ;
 	/** 提货重量 */
 	@ApiModelProperty(name = "提货重量",notes = "")
-	private BigDecimal realWeight ;
+	private Double realWeight ;
 	/** 提货体积 */
 	@ApiModelProperty(name = "提货体积",notes = "")
-	private BigDecimal realVolume ;
+	private Double realVolume ;
 
 
 }

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineBillladingLineVO.java

@@ -0,0 +1,11 @@
+package com.logpm.trunkline.vo;
+
+import com.logpm.trunkline.entity.TrunklineBillladingLineEntity;
+import lombok.Data;
+
+@Data
+public class TrunklineBillladingLineVO extends TrunklineBillladingLineEntity {
+
+
+
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.java

@@ -0,0 +1,9 @@
+package com.logpm.trunkline.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.trunkline.entity.TrunklineBillladingLineEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TrunklineBillladingLineMapper extends BaseMapper<TrunklineBillladingLineEntity> {
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingLineMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineBillladingLineMapper">
+
+
+</mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineBillladingPackageMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineBillladingPackageMapper">
+
+
+</mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineDetailProductMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.trunkline.mapper.TrunklineDetailProductMapper">
+
+
+</mapper>

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/ITrunklineBillladingLineService.java

@@ -0,0 +1,7 @@
+package com.logpm.trunkline.service;
+
+import com.logpm.trunkline.entity.TrunklineBillladingLineEntity;
+import org.springblade.core.mp.base.BaseService;
+
+public interface ITrunklineBillladingLineService extends BaseService<TrunklineBillladingLineEntity> {
+}

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineBillladingLineServiceImpl.java

@@ -0,0 +1,15 @@
+package com.logpm.trunkline.service.impl;
+
+import com.logpm.trunkline.entity.TrunklineBillladingLineEntity;
+import com.logpm.trunkline.mapper.TrunklineBillladingLineMapper;
+import com.logpm.trunkline.service.ITrunklineBillladingLineService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@AllArgsConstructor
+@Service
+public class TrunklineBillladingLineServiceImpl extends BaseServiceImpl<TrunklineBillladingLineMapper, TrunklineBillladingLineEntity> implements ITrunklineBillladingLineService {
+}