Merge branch 'dev' into test

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionParcelListClient.java

@@ -17,9 +17,11 @@
 package com.logpm.distribution.feign;
 
 import com.logpm.distribution.entity.DistributionParcelListEntity;
+import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -52,6 +54,6 @@ public interface IDistributionParcelListClient {
 	@GetMapping(API_PREFIX+"/findByPacketBarCode")
 	DistributionParcelListEntity findByPacketBarCode(String unitNo);
 
-	@GetMapping(API_PREFIX+"/addBatch")
+	@PostMapping(API_PREFIX+"/addBatch")
 	boolean addBatch(@RequestBody List<DistributionParcelListEntity> parcelListEntityList);
 }

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/entity/AdvanceDetailEntity.java

@@ -17,14 +17,12 @@
 package com.logpm.oldproject.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 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.mp.base.BaseEntity;
-import org.springblade.core.tenant.mp.TenantEntity;
 
 import java.time.LocalDate;
 
@@ -59,11 +57,13 @@ public class AdvanceDetailEntity {
 	 * 线下订单明细标时
 	 */
 	@ApiModelProperty(value = "线下订单明细标时")
+	@TableField("lineID")
 	private String lineID;
 	/**
 	 * 序列号
 	 */
 	@ApiModelProperty(value = "序列号")
+	@TableField("serialKey")
 	private String serialKey;
 	/**
 	 * 区域
@@ -74,6 +74,7 @@ public class AdvanceDetailEntity {
 	 * 订单自编号
 	 */
 	@ApiModelProperty(value = "订单自编号")
+	@TableField("orderSelfNum")
 	private String orderSelfNum;
 	/**
 	 * 订单来源
@@ -84,11 +85,13 @@ public class AdvanceDetailEntity {
 	 * 订单类型
 	 */
 	@ApiModelProperty(value = "订单类型")
+	@TableField("systemType")
 	private String systemType;
 	/**
 	 * MSCS单号
 	 */
 	@ApiModelProperty(value = "MSCS单号")
+	@TableField("orderNum")
 	private String orderNum;
 	/**
 	 * 是否干仓配：1=是，0=否
@@ -99,101 +102,121 @@ public class AdvanceDetailEntity {
 	 * MTDS单号
 	 */
 	@ApiModelProperty(value = "MTDS单号")
+	@TableField("mtdsNo")
 	private String mtdsNo;
 	/**
 	 * 一级品类
 	 */
 	@ApiModelProperty(value = "一级品类")
+	@TableField("firstPackName")
 	private String firstPackName;
 	/**
 	 * 二级品类
 	 */
 	@ApiModelProperty(value = "二级品类")
+	@TableField("firstPackCode")
 	private String firstPackCode;
 	/**
 	 * 基地名称
 	 */
 	@ApiModelProperty(value = "基地名称")
+	@TableField("siteName")
 	private String siteName;
 	/**
 	 * 基地编码
 	 */
 	@ApiModelProperty(value = "基地编码")
+	@TableField("siteCode")
 	private String siteCode;
 	/**
 	 * 货品名称
 	 */
 	@ApiModelProperty(value = "货品名称")
+	@TableField("productCode")
 	private String productCode;
 	/**
 	 * 二级品类名称
 	 */
 	@ApiModelProperty(value = "二级品类名称")
+	@TableField("secondPackName")
 	private String secondPackName;
 	/**
 	 * 二级品类
 	 */
 	@ApiModelProperty(value = "二级品类")
+	@TableField("secondPackCode")
 	private String secondPackCode;
 	/**
 	 * 三级品类名称
 	 */
 	@ApiModelProperty(value = "三级品类名称")
+	@TableField("thirdPackName")
 	private String thirdPackName;
 	/**
 	 * 三级品类
 	 */
 	@ApiModelProperty(value = "三级品类")
+	@TableField("thirdPackCode")
 	private String thirdPackCode;
 	/**
 	 * 产品类型
 	 */
 	@ApiModelProperty(value = "产品类型")
+	@TableField("goodName")
 	private String goodName;
 	/**
 	 * 例放：N=正常，Y=例放
 	 */
 	@ApiModelProperty(value = "例放：N=正常，Y=例放")
+	@TableField("isAddin")
 	private String isAddin;
 	/**
 	 * 三级例放：N=正常，Y=例放
 	 */
 	@ApiModelProperty(value = "三级例放：N=正常，Y=例放")
+	@TableField("isThirdAddin")
 	private String isThirdAddin;
 	/**
 	 * 补进：N=正常，Y=例放
 	 */
 	@ApiModelProperty(value = "补进：N=正常，Y=例放")
+	@TableField("isSuppin")
 	private String isSuppin;
 	/**
 	 * 发货数量
 	 */
 	@ApiModelProperty(value = "发货数量")
+	@TableField("mscsNum")
 	private String mscsNum;
 	/**
 	 * 销售数量
 	 */
 	@ApiModelProperty(value = "销售数量")
+	@TableField("mtdsNum")
 	private Integer mtdsNum;
 	/**
 	 * 体积
 	 */
 	@ApiModelProperty(value = "体积")
+	@TableField("volume")
 	private String volume;
 	/**
 	 * 包条码
 	 */
 	@ApiModelProperty(value = "包条码")
+	@TableField("unitNo")
 	private String unitNo;
 	/**
 	 * 车次号
 	 */
 	@ApiModelProperty(value = "车次号")
+	@TableField("mctsTruck")
 	private String mctsTruck;
 	/**
 	 * 车牌号
 	 */
 	@ApiModelProperty(value = "车牌号")
+	@TableField("mctsTruckNo")
 	private String mctsTruckNo;
 	/**
 	 * 基地发货日期
@@ -234,6 +257,7 @@ public class AdvanceDetailEntity {
 	 * 服务号
 	 */
 	@ApiModelProperty(value = "服务号")
+	@TableField("serviceNum")
 	private String serviceNum;
 	/**
 	 *
@@ -249,6 +273,7 @@ public class AdvanceDetailEntity {
 	 * 交期
 	 */
 	@ApiModelProperty(value = "交期")
+	@TableField("dueDate")
 	private LocalDate dueDate;
 	/**
 	 * 交期

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java

@@ -18,13 +18,14 @@ package com.logpm.distribution.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.entity.DistributionParcelListEntity;
+import com.logpm.distribution.service.IDistributionParcelListService;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
-import com.logpm.distribution.entity.DistributionParcelListEntity;
-import com.logpm.distribution.service.IDistributionParcelListService;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -62,6 +63,7 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 	}
 
 	@Override
+	@PostMapping(API_PREFIX+"/addBatch")
 	public boolean addBatch(List<DistributionParcelListEntity> parcelListEntityList) {
 		return distributionParcelListService.saveBatch(parcelListEntityList);
 	}

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/AdvanceDetailMapper.xml

@@ -79,7 +79,7 @@
         SELECT
             wo.waybill_no logiBillNo,
             wb.arrive_site destinationWarehouse,
-            wb.arrive_site_id destinationWarehouseId
+            cast (wb.arrive_site_id as char) destinationWarehouseId
         FROM ht_advance_detail d
                  left join ht_waybill_order wo on wo.advance_id = d.advance_id and wo.delete_time = 0
                  left join ht_way_bill wb on wb.id = wo.way_bill_id and wb.delete_time = 0