1.修复bug

blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/service/impl/FactoryCommonServiceImpl.java

@@ -65,8 +65,8 @@ public class FactoryCommonServiceImpl implements IFactoryCommonService {
 			TrayEntity trayEntity = trayClient.getTrayById(trayId);
 			basicdataTrayEntity = new BasicdataTrayEntity();
 			basicdataTrayEntity.setTenantId("627683");
-			basicdataTrayEntity.setCreateUser(1649331096967450625L);
-			basicdataTrayEntity.setUpdateUser(1649331096967450625L);
+			basicdataTrayEntity.setCreateUser(1714696768639311873L);
+			basicdataTrayEntity.setUpdateUser(1714696768639311873L);
 			basicdataTrayEntity.setCreateDept(1649331096241836033L);
 			basicdataTrayEntity.setPalletName(trayEntity.getTrayNo());
 			basicdataTrayEntity.setPalletCode("T"+trayEntity.getId());

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -489,7 +489,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 				// 增加订单 经销商信息 和门店信息
 				buildDealerAndStore(distributionStockArticleEntity, advanceEntity);
 
-				distributionStockArticleEntity.setCreateUser(1123598821738675201L);
+				distributionStockArticleEntity.setCreateUser(1714696768639311873L);
+				distributionStockArticleEntity.setUpdateUser(1714696768639311873L);
+				distributionStockArticleEntity.setCreateDept(1649331096241836033L);
 				distributionStockArticleEntity.setSortingQuantity(0); //分拣件数
 				distributionStockArticleEntity.setDeliveryQuantity(0); //配送件数
 				distributionStockArticleEntity.setTransferQuantity(0); //中转件数
@@ -518,13 +520,13 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum,operationTime);
 
 			//---------------------2023-10-20 17:23:00 增加打托数据
-			Integer oldId = basicdataWarehouseEntity.getOldId();
-			Long warehouseEntityId = basicdataWarehouseEntity.getId();
-			try{
-				saveTrayTypeInfoPackage(unitNo,oldId,warehouseEntityId);
-			}catch (Exception e){
-				logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo);
-			}
+//			Integer oldId = basicdataWarehouseEntity.getOldId();
+//			Long warehouseEntityId = basicdataWarehouseEntity.getId();
+//			try{
+//				saveTrayTypeInfoPackage(unitNo,oldId,warehouseEntityId);
+//			}catch (Exception e){
+//				logger.error("################handleDataToPlatform: unitNo={} 打托失败",unitNo);
+//			}
 
 			String waybillNumber = distributionStockArticleEntity.getWaybillNumber();
 			if(!waybillNumber.contains(waybillNoNum)){
@@ -707,7 +709,9 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 			if (!Objects.isNull(basicdataWarehouseEntity)) {
 				entity.setCreateDept(basicdataWarehouseEntity.getDepartment());
 			}
-			entity.setCreateUser(1123598821738675201L);
+			entity.setCreateUser(1714696768639311873L);
+			entity.setUpdateUser(1714696768639311873L);
+			entity.setCreateDept(1649331096241836033L);
 			entity.setTenantId(TenantNum.HUITONGCODE);
 			if (StringUtil.isNoneBlank(entity.getMaterialName()) && StringUtil.isNoneBlank(entity.getMaterialCode())) {
 				// 查询物料信息

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

@@ -3052,6 +3052,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		for (WarehouseTrayGoodsEntity trayGoodsEntity:trayGoodsList){
 			WarehouseTrayGoodsLogEntity trayGoodsLogEntity = new WarehouseTrayGoodsLogEntity();
 			BeanUtil.copy(trayGoodsEntity,trayGoodsLogEntity);
+			trayGoodsLogEntity.setId(null);
 			trayGoodsLogEntity.setBindingType(bindingType);
 			trayGoodsLogEntity.setRemark(remark);
 			trayGoodsLogEntity.setPalletizingType(palletizingType);