修改客户编辑

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

@@ -72,6 +72,11 @@ public class DistributionStockListEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "在库订单ID")
 	private Long stockArticleId;
+	/**
+	 * 在库订单ID
+	 */
+	@ApiModelProperty(value = "在库订单ID")
+	private Long parcelListId;
 	/**
 	 * 入库批次号
 	 */

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

@@ -109,7 +109,10 @@ public class BasicdataClientServiceImpl extends BaseServiceImpl<BasicdataClientM
 						stringList.add(i.getId());
 					}
 				});
-				basicdataStoreBusinessService.deleteLogic(stringList);
+				if(stringList.size() > 0){
+					basicdataStoreBusinessService.deleteLogic(stringList);
+				}
+
 			}
 			for (String s : basicdataClient.getTypeServiceList()) {
 				//添加服务类型

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

@@ -16,6 +16,8 @@
  */
 package com.logpm.distribution.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -189,7 +189,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 				stockEntityList.add(distributionStock);
 			}*/
 		}
-		return distributionStockService.saveBatch(stockEntityList);
+//		return distributionStockService.saveBatch(stockEntityList);
+		return  true;
 	}
 
 	/**
@@ -200,6 +201,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public DistributionStockArticleEntity addStockList(String s){
 		//查询在库订单信息
 		DistributionStockArticleEntity distributionStockArticleEntity = baseMapper.selectById(s);
+
+
+
 		DistributionStockListEntity distributionStockListEntity = new DistributionStockListEntity();
 		distributionStockListEntity.setStockArticleId(Long.parseLong(s));
 		distributionStockListEntity.setOrderSelfNumbering(distributionStockArticleEntity.getOrderSelfNumbering());