Merge branch 'dev' into pre-production

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataDriverArteryImproterExcel.java

@@ -209,4 +209,5 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	private Long userId;
 
 
+
 }

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

@@ -228,7 +228,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 				//连接到前端后取消注释
 				BladeUser user = AuthUtil.getUser();
 				copy.setTenantId(user.getTenantId());// 租户号
-				copy.setUserId(user.getUserId());    // 创建人
+				copy.setCreateUser(user.getUserId());    // 创建人
 				copy.setUpdateUser(user.getUserId());// 更新人
 				log.info("复制后>>>>>>>>>>>>{}", copy);
 

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

@@ -242,7 +242,6 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			return false;
 		}
 
-
  		DistributionStockListEntity one2 = this.getOne(Wrappers.<DistributionStockListEntity>query().lambda()
 			.eq(ObjectUtil.isNotEmpty(distributionStockListDTO.getMaterialId()),DistributionStockListEntity::getMaterialId, distributionStockListDTO.getMaterialId())
 			.eq(DistributionStockListEntity::getPid, distributionStockListDTO.getId())
@@ -276,7 +275,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			BeanUtil.copyProperties(d, distributionStockListInfo);
 			distributionStockListInfo.setId(null);
 			distributionStockListInfo.setStockListId(d.getId());
-			distributionStockListInfo.setOutboundQuantity(0);
+//			distributionStockListInfo.setOutboundQuantity(0);
 			distributionStockListInfo.setGroundingTime(new Date());
 			distributionStockListInfo.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));
 //			distributionStockListInfo.setOrderCode(one.getOrderCode());
@@ -339,10 +338,11 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				distributionStockListEntity.setMaterialId(aLong);
 				distributionStockListEntity.setSourceType("2");
 				distributionStockListEntity.setCargoUnit(DictBizCache.getValue(DictBizConstant.LOGPM_UNIT, distributionStockListDTO.getCargoUnit()));
-				distributionStockListEntity.setDescriptionGoods(distributionStockListDTO.getMaterialIdName());
+				distributionStockListEntity.setDescriptionGoods(basicMaterialEntity.getName());
-				distributionStockListEntity.setCargoNumber(distributionStockListDTO.getCargoNumber());
+				distributionStockListEntity.setCargoNumber(basicMaterialEntity.getProductCode());
-				distributionStockListEntity.setCargoNorms(distributionStockListDTO.getCargoNorms());
+				distributionStockListEntity.setCargoNorms(basicMaterialEntity.getSpecification());
 				distributionStockListEntity.setQuantityOccupied(0);
+				distributionStockListEntity.setServiceNumber(one.getServiceNumber());
 				distributionStockListEntity.setIncomingBatch(one.getIncomingBatch());
 				distributionStockListEntity.setId(null);
 				this.save(distributionStockListEntity);

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java

@@ -90,14 +90,13 @@ public class DistributionDatarepair {
 
 
 	/**
-	 * 维护
+	 * 维护配送状态
 	 * @return
 	 */
 	@XxlJob("maintenanceDeliveryStatus")
 	public ReturnT<String> maintenanceDeliveryStatus(String params) {
 		//维护配送的状态
 		Integer row = iSyncDistributionParcelListService.updateCompleteDeliveryStatus();
-
 		return ReturnT.SUCCESS;
 	}
 

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/OrderDataRepair.java

@@ -31,7 +31,6 @@ public class OrderDataRepair {
 				continue;
 			}
 		}
-
 		log.info("####################repairOrderSignStatus: 修复订单签收状态 完成");
 		return ReturnT.SUCCESS;
 	}