Merge branch 'pre-production'

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

@@ -868,6 +868,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			listEntity.setQuantityStock(quantity + quantityStock);
 			distributionStockListService.updateById(listEntity);
 		} else {
+			log.info("###########distributionStockListEntity>>>>>>>>,{}",distributionStockListEntity);
 			distributionStockListService.save(distributionStockListEntity);
 		}
 //		distributionStockListEntity.setTrayName(Optional.ofNullable(distributionParcelList.getPallet()).orElse(null)); //托盘

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -915,6 +915,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		advanceEntity.setWaybillStatus("0");
 		advanceEntity.setFreezeStatus("0");
 		advanceEntity.setLegacyStatus("0");
+		advanceEntity.setCreateUserName(AuthUtil.getNickName());
 		advanceService.save(advanceEntity);
 		Long advanceId = advanceEntity.getId();
 
@@ -1019,6 +1020,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceEntity.setWaybillStatus("0");
 				advanceEntity.setFreezeStatus("0");
 				advanceEntity.setLegacyStatus("0");
+				advanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(advanceEntity);
 			}else{
 				Long advanceId = advanceEntity.getId();
@@ -1150,7 +1152,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
 				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importCustomizedOuPaiDTO.getDueDateStr()));
-				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName());
+				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(trunklineAdvanceEntity);
 			}else{
 				Long advanceId = trunklineAdvanceEntity.getId();
@@ -1260,7 +1262,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				trunklineAdvanceEntity.setFreezeStatus("0");
 				trunklineAdvanceEntity.setLegacyStatus("0");
 				trunklineAdvanceEntity.setDeliveryDate(CommonUtil.StringToDate(importStandardOuPaiDTO.getDueDateStr()));
-				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getUserName());
+				trunklineAdvanceEntity.setCreateUserName(AuthUtil.getNickName());
 				advanceService.save(trunklineAdvanceEntity);
 			}else{
 				Long advanceId = trunklineAdvanceEntity.getId();

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java

@@ -163,6 +163,8 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	private void createStockArticle(WarehouseWaybillEntity warehouseWaybill,Integer allNum) {
 		//判断新系统是否有这条订单数据
 		//自动生成的在库订单就用运单号作为订单号
+
+		try{
 			String waybillNo = warehouseWaybill.getWaybillNo();
 			Long waybillId = warehouseWaybill.getId();
 			String destinationWarehouse = warehouseWaybill.getDestinationWarehouseName();//目的仓
@@ -186,8 +188,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				distributionStockArticleEntity.setWaybillId(warehouseWaybill.getId());
 				distributionStockArticleEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 				distributionStockArticleEntity.setMallName(consignee);
+				if(!Objects.isNull(clientEntity)){
+					distributionStockArticleEntity.setMallName(clientEntity.getClientName());
 					distributionStockArticleEntity.setMallCode(clientEntity.getClientCode());
-			distributionStockArticleEntity.setMallId(warehouseWaybill.getConsigneeId());
+					distributionStockArticleEntity.setMallId(clientEntity.getId());
+				}
 				distributionStockArticleEntity.setDescriptionGoods(warehouseWaybill.getGoodsName());
 				distributionStockArticleEntity.setWarehouse(basicdataWarehouseEntity.getName());
 				distributionStockArticleEntity.setWarehouseEntryTime(date);
@@ -318,6 +323,10 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 				distributionStockArticleClient.saveOrUpdate(distributionStockArticleEntity);
 
 			}
+		}catch (Exception e){
+			log.error(">>>>> createStockArticle",e);
+		}
+
 
 		//存入包件信息
 //		List<WarehouseWayBillDetail> details = warehouseWayBillDetailService.findByWaybillId(waybillId);