1.修改增值服务

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

@@ -236,16 +236,7 @@ public class DistributionDeliveryListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "数据来源")
 	private Integer source;
-	/**
+
-	 * 定位打卡
-	 */
-	@ApiModelProperty(value = "定位打卡")
-	private String positioning;
-	/**
-	 * 定位打卡地址
-	 */
-	@ApiModelProperty(value = "定位打卡地址")
-	private String positioningAdr;
 
 
 

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

@@ -277,5 +277,16 @@ public class DistributionSignforEntity extends TenantEntity {
 //	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
 	private String loadingTime;
 
+	/**
+	 * 定位打卡
+	 */
+	@ApiModelProperty(value = "定位打卡")
+	private String positioning;
+	/**
+	 * 定位打卡地址
+	 */
+	@ApiModelProperty(value = "定位打卡地址")
+	private String positioningAdr;
+
 
 }

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

@@ -79,6 +79,11 @@ public class DistributionDeliveryInfoVO extends DistributionDeliveryInfoEntity {
 	 */
 	@ApiModelProperty(value = "物品名称")
 	private String materialName;
+	/**
+	 * 物品编号
+	 */
+	@ApiModelProperty(value = "物品编号")
+	private String materialCode;
 	/**
 	 * 货位信息
 	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionSignforController.java

@@ -107,6 +107,8 @@ public class DistributionSignforController extends BladeController {
 		return R.data(pages);
 	}
 
+
+
 	/**
 	 * 签收管理 自定义分页
 	 */

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

@@ -96,8 +96,8 @@
         ldpl.firsts firsts,
         ldpl.second second,
         ldpl.third_product thirdProduct,
-        ldpl.material material,
         ldpl.material_name materialName,
+        ldpl.material_code materialCode,
         ldpl.quantity quantity,
         ldpl.train_number trainNumber,
         ldpl.stock_article_id stockArticleId

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

@@ -77,7 +77,7 @@ public interface IDistributionSignforService extends BaseService<DistributionSig
 	 */
 	DistributionSignforVO getOneCustom(Long id);
 	/**
-	 * 签收管理  司机签收
+	 *App- 签收管理  司机签收
 	 */
 	R signforack(DistributionSignforEntity distributionSignfor);
 	/**