库存调整记录调整人改为存名字;

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java

@@ -3,6 +3,7 @@ package com.mhd.wms.domain.handoverTaskOrder.service;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.mhd.common.core.domain.po.UserPo;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.bean.BeanUtils;
@@ -271,7 +272,8 @@ public class HandoverTaskOrderDomainService {
                     inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
                     inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
                     inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                    inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
+                    UserPo userPo = loginUser.getUserPo();
+                    if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                     inventoryAdjustmentRecord.setCreateTime(new Date());
                     inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventoryPO.getAllocationQuantity());
                     inventoryAdjustmentRecord.setAllocationBeforeQuantity(materialInventoryPO.getAllocationQuantity());
@@ -279,9 +281,6 @@ public class HandoverTaskOrderDomainService {
                     inventoryAdjustmentRecord.setFreezeAfterQuantity(newFreezeQuantity);
                     inventoryAdjustmentRecord.setInventoryBeforeQuantity(oldInventoryQuantity);
                     inventoryAdjustmentRecord.setInventoryAfterQuantity(newInventoryQuantity);
-                    inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                    inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
-                    inventoryAdjustmentRecord.setCreateTime(new Date());
                     inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
                 }
             }

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mhd.common.core.constant.SnowFlakeConstants;
+import com.mhd.common.core.domain.po.UserPo;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.IgnoreNullUtil;
 import com.mhd.common.core.utils.StringUtils;
@@ -484,7 +485,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
+                UserPo userPo = loginUser.getUserPo();
+                if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity);
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);
@@ -492,9 +494,6 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setFreezeAfterQuantity(newFreezeQuantity);
                 inventoryAdjustmentRecord.setInventoryBeforeQuantity(materialInventoryPO.getInventoryQuantity());
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventoryPO.getInventoryQuantity());
-                inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
-                inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             }
             /*Long uniqueId = outMaterialDetail.getUniqueId();
@@ -569,7 +568,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
+                UserPo userPo = loginUser.getUserPo();
+                if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity);
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);
@@ -804,7 +804,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
+                UserPo userPo = loginUser.getUserPo();
+                if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity);
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);
@@ -812,9 +813,6 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setFreezeAfterQuantity(newFreezeQuantity);
                 inventoryAdjustmentRecord.setInventoryBeforeQuantity(materialInventoryPO.getInventoryQuantity());
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventoryPO.getInventoryQuantity());
-                inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
-                inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             }
 
@@ -880,7 +878,8 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventoryPO.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventoryPO.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
+                UserPo userPo = loginUser.getUserPo();
+                if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity);
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);
@@ -888,9 +887,6 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
                 inventoryAdjustmentRecord.setFreezeAfterQuantity(newFreezeQuantity);
                 inventoryAdjustmentRecord.setInventoryBeforeQuantity(materialInventoryPO.getInventoryQuantity());
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventoryPO.getInventoryQuantity());
-                inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
-                inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             }
         }

mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.mhd.common.core.constant.SnowFlakeConstants;
+import com.mhd.common.core.domain.po.UserPo;
 import com.mhd.common.core.exception.ServiceException;
 import com.mhd.common.core.utils.OrderSequence;
 import com.mhd.common.core.utils.StringUtils;
@@ -729,7 +730,8 @@ public class StockShelfOrderDomainService {
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventory.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventory.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
+                UserPo userPo = loginUser.getUserPo();
+                if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(materialInventory.getAllocationQuantity());
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(BigDecimal.ZERO);
@@ -737,9 +739,6 @@ public class StockShelfOrderDomainService {
                 inventoryAdjustmentRecord.setFreezeAfterQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setInventoryBeforeQuantity(BigDecimal.ZERO);
                 inventoryAdjustmentRecord.setInventoryAfterQuantity(materialInventory.getInventoryQuantity());
-                inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getRealname());
-                inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecordMapper.insert(inventoryAdjustmentRecord);
             } else if (materialInventoryPOS.size() == 1) {
                 MaterialInventory materialInventory = new MaterialInventory();