blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesProcessingMoneyEntity.java

@@ -98,11 +98,6 @@ public class AftersalesProcessingMoneyEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "处理结果名称")
 	private String resultName;
-	/**
-	 * 支付单位
-	 */
-	@ApiModelProperty(value = "支付单位")
-	private String paymentUnit;
 	/**
 	 * 类型
 	 */

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

@@ -157,7 +157,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			this.updateById(distrilbutionBillLading);
 			if(!distrilbutionBillLading.getBillPackageEntityList().isEmpty() || !distrilbutionBillLading.getUnBillPackageEntityList().isEmpty()){
 				//修改新增包件
-				//todo
+				//todo 还没有改
 				updateBillPackeg(distrilbutionBillLading);
 			}
 			//修改零担数据
@@ -1444,7 +1444,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			return Resp.scanFail("3000", "参数不完整！！");
 		} else {
 			DistrilbutionBillLadingEntity billLadingEntity1 = baseMapper.selectById((Serializable) billLadingId);
-			if(ObjectUtils.isNotNull(billLadingEntity1) && "20".equals(billLadingEntity1.getConditions())){
+			if(ObjectUtils.isNotNull(billLadingEntity1) && billLadingEntity1.getConditions().equals("20")){
 				return  Resp.scanFail("提货任务已完成！", "提货任务已完成！");
 			}
 			BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
@@ -1553,16 +1553,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 								//修改备货订单状态
 								distributionAsyncService.getBillStock(one1.getId());
 							}
-							//修改在库数量
-							if(ObjectUtils.isNotNull( one.getHandQuantity()) && one.getHandQuantity() > 0){
-								int i = one.getHandQuantity() - 1;
-								int i2 = ObjectUtils.isNull(one.getSigninQuantity()) ? 1 : one.getSigninQuantity() + 1;
-								distributionStockArticleService.update(Wrappers.<DistributionStockArticleEntity>update()
-									.eq("id",one.getId())
-									.set("hand_quantity",i)
-									.set("signin_quantity", i2)
-								);
-							}
 							//修改包件状态
 							distributionAsyncService.getSelfPickup(list1.get(0).getId());
 							distributionBillLadingScan.setParcelListId(list1.get(0).getId());