已签订单调整

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

@@ -270,13 +270,13 @@ public class DistributionSignforStockArticleVO implements Serializable {
 	 * 签收ID
 	 */
 	@ApiModelProperty(value = "签收ID")
-	private Date signforId;
+	private Long signforId;
 
 	/**
 	 * 配送ID
 	 */
 	@ApiModelProperty(value = "配送ID")
-	private Date deliveryId;
+	private Long deliveryId;
 
 
 	/**

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

@@ -387,6 +387,8 @@ public class DistributionStockArticleController extends BladeController {
 			BeanUtil.copy(oldStockArticle,newStockArticle);
 			String consigneePerson = stockArticleEntity.getConsigneePerson();
 			String customerName = stockArticleEntity.getCustomerName();
+			String mallName = stockArticleEntity.getMallName();
+			String consigneeUnit = stockArticleEntity.getConsigneeUnit();
 			if(StringUtil.isNotBlank(consigneePerson)){
 				newStockArticle.setConsigneePerson(consigneePerson);
 				newStockArticle.setConsigneeMobile(stockArticleEntity.getConsigneeMobile());
@@ -396,8 +398,8 @@ public class DistributionStockArticleController extends BladeController {
 				newStockArticle.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
 				newStockArticle.setCustomerAddress(stockArticleEntity.getCustomerAddress());
 			}else {
-				newStockArticle.setMallName(customerName);
+				newStockArticle.setMallName(mallName);
-				newStockArticle.setConsigneeUnit(customerName);
+				newStockArticle.setConsigneeUnit(consigneeUnit);
 			}
 			String content = oldStockArticle.compareCustomerInfo(newStockArticle);
 			if(StringUtil.isNotBlank(content)){