1.车辆字典

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionSigndetailEntity.java

@@ -106,10 +106,15 @@ public class DistributionSigndetailEntity extends TenantEntity {
 	@ApiModelProperty(value = "货物名称")
 	private String goodsName;
 	/**
-	 * 仓库
+	 * 仓库名称
 	 */
-	@ApiModelProperty(value = "仓库")
-	private String warehouse;
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+	/**
+	 * 仓库Id
+	 */
+	@ApiModelProperty(value = "仓库Id")
+	private String warehouseId;
 	/**
 	 * 入库时间
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionSigndetailVO.java

@@ -38,10 +38,15 @@ import java.util.List;
 public class DistributionSigndetailVO extends DistributionSigndetailEntity {
 	private static final long serialVersionUID = 1L;
 	/**
-	 * 客户
+	 * 客户名称
 	 */
-	@ApiModelProperty(value = "客户")
-	private String consignee;
+	@ApiModelProperty(value = "客户名称")
+	private String consigneeName;
+	/**
+	 * 客户Id
+	 */
+	@ApiModelProperty(value = "客户Id")
+	private String consigneeId;
 	/**
 	 * 客户电话
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java

@@ -116,7 +116,7 @@ public class BasicdataDriverArteryController extends BladeController {
 	public R save(@Valid @RequestBody BasicdataDriverArteryDTO basicdataDriverArtery) {
 		boolean save = basicdataDriverArteryService.save(basicdataDriverArtery);
 		//加入关联表
-		if (null !=basicdataDriverArtery.getBindVehicles() && save){
+		if (null !=basicdataDriverArtery.getBindVehicles()&& save){
 			Integer b =	basicdataDriverArteryService.updateVehicle(basicdataDriverArtery);
 		}
 		return R.status(save);

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java

@@ -71,8 +71,9 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 	public Integer updateVehicle(BasicdataDriverArteryDTO basicdataDriverArtery) {
 		//删除原有绑定关系
 		int delete = basicdataDrivermiddleMapper.delete(new QueryWrapper<BasicdataDrivermiddleEntity>().lambda().eq(BasicdataDrivermiddleEntity::getDriverId, basicdataDriverArtery.getId()));
+		if (basicdataDriverArtery.getBindVehicles().equals(""))return delete;
 		//新增现有的数据
-		if (delete>0){
+		//if (delete>0){
 			List<String> bindVehicles = Arrays.asList(basicdataDriverArtery.getBindVehicles().split(","));
 			ArrayList<BasicdataDrivermiddleEntity> basicdataDrivermiddleEntities = new ArrayList<>();
 			bindVehicles.forEach(e->{
@@ -82,7 +83,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 				basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity);
 			});
 			basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities);
-		}
+		//}
 		return delete;
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataVehicleServiceImpl.java

@@ -83,8 +83,9 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 	public Integer updateOwners(BasicdataVehicleDTO basicdataVehicle) {
 		//删除原有绑定关系
 		int delete = basicdataDrivermiddleMapper.delete(new QueryWrapper<BasicdataDrivermiddleEntity>().lambda().eq(BasicdataDrivermiddleEntity::getBrandId, basicdataVehicle.getId()));
+		if (basicdataVehicle.getVehicleOwners().equals(""))return delete;
 		//新增现有的数据
-		if (delete>0){
+	//	if (delete>0){
 			List<String> bindOwners = Arrays.asList(basicdataVehicle.getVehicleOwners().split(","));
 			ArrayList<BasicdataDrivermiddleEntity> basicdataDrivermiddleEntities = new ArrayList<>();
 			bindOwners.forEach(e->{
@@ -94,7 +95,7 @@ public class BasicdataVehicleServiceImpl extends BaseServiceImpl<BasicdataVehicl
 				basicdataDrivermiddleEntities.add(basicdataDrivermiddleEntity);
 			});
 			basicdataDrivermiddleService.saveBatch(basicdataDrivermiddleEntities);
-		}
+	//	}
 		return delete;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/DistributionApplication.java

@@ -30,7 +30,7 @@ import org.springblade.core.launch.BladeApplication;
 public class DistributionApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME, DistributionApplication.class, args);
+		BladeApplication.run(ModuleNameConstant.APPLICATION_DISTRIBUTION_NAME.concat("-lmy"), DistributionApplication.class, args);
 	}
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/DistributionSigndetailDTO.java

@@ -39,7 +39,7 @@ public class DistributionSigndetailDTO extends DistributionSigndetailEntity {
 	 * 客户
 	 */
 	@ApiModelProperty(value = "客户")
-	private String consignee;
+	private String consigneeName;
 	/**
 	 * 客户电话
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionSigndetailMapper.xml

@@ -26,7 +26,7 @@
         <result column="order_id" property="orderId"/>
         <result column="mall_name" property="mallName"/>
         <result column="goods_name" property="goodsName"/>
-        <result column="warehouse" property="warehouse"/>
+        <result column="warehouse" property="warehouseName"/>
         <result column="warehousing_time" property="warehousingTime"/>
         <result column="lead_time" property="leadTime"/>
         <result column="duration_in_stock" property="durationInStock"/>
@@ -54,7 +54,8 @@
         ldsd.is_kitting isKitting,
         ldsd.brand brand,
         ldsd.signed_number signedNumber,
-        ldsf.consignee consignee,
+        ldsf.consignee_name consigneeName,
+        ldsf.consignee_id consigneeId,
         ldsf.signing_time signingTime,
         ldsf.sjsigning_time sjsigningTime,
         ldsf.delivery_phone deliveryPhone,
@@ -85,8 +86,8 @@
             <if test="param.goodsName!=null and param.goodsName!=''">
                 and ldsd.goods_name like concat('%',#{param.goodsName},'%')
             </if>
-            <if test="param.warehouse!=null and param.warehouse!=''">
-                and ldsd.warehouse like concat('%',#{param.warehouse},'%')
+            <if test="param.warehouseName!=null and param.warehouseName!=''">
+                and ldsf.warehouse_name like concat('%',#{param.warehouseName},'%')
             </if>
             <if test="param.durationInStock!=null and param.durationInStock!=''">
                 and ldsd.duration_in_stock like concat('%',#{param.durationInStock},'%')
@@ -94,8 +95,8 @@
             <if test="param.deliveryAddress!=null and param.deliveryAddress!=''">
                 and ldsf.deliveryAddress like concat('%',#{param.deliveryAddress},'%')
             </if>
-            <if test="param.consignee!=null and param.consignee!=''">
-                and ldsd.consignee like concat('%',#{param.consignee},'%')
+            <if test="param.consigneeName!=null and param.consigneeName!=''">
+                and ldsd.consignee_name like concat('%',#{param.consigneeName},'%')
             </if>
             <if test="param.consigneePhone!=null and param.consigneePhone!=''">
                 and ldsd.consignee_phone like concat('%',#{param.consigneePhone},'%')