diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
index fe7640975..4df937db4 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/stockShelfOrder/service/StockShelfOrderDomainService.java
@@ -711,10 +711,10 @@ public class StockShelfOrderDomainService {
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
                 inventoryAdjustmentRecord.setAdjustAction("入库");
                 inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber());
-                inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-//                inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-//                inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+                inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" :  materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" :  materialInventory.getMaterialStatusName());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName()  == null ? "" :  materialInventory.getMaterialStatusName());
                 inventoryAdjustmentRecord.setAdjustType(1L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(shelfMaterialDetail.getMaterialCode());
@@ -806,10 +806,12 @@ public class StockShelfOrderDomainService {
 
 
                 InventoryAdjustmentRecord inventoryAdjustmentRecord = new InventoryAdjustmentRecord();
-                inventoryAdjustmentRecord.setAdjustAfterStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusCode("he_ge");
-                inventoryAdjustmentRecord.setAdjustAfterStatusName("合格");
-                inventoryAdjustmentRecord.setAdjustBeforeStatusName("合格");
+                inventoryAdjustmentRecord.setAdjustAction("入库");
+                inventoryAdjustmentRecord.setRelateNo(stockReceiptOrderDO.getInOrderNumber());
+                inventoryAdjustmentRecord.setAdjustAfterStatusCode(materialInventory.getMaterialStatusCode() == null ? "" : materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusCode(materialInventory.getMaterialStatusCode() == null ? "" :  materialInventory.getMaterialStatusCode());
+                inventoryAdjustmentRecord.setAdjustAfterStatusName(materialInventory.getMaterialStatusName() == null ? "" :  materialInventory.getMaterialStatusName());
+                inventoryAdjustmentRecord.setAdjustBeforeStatusName(materialInventory.getMaterialStatusName()  == null ? "" :  materialInventory.getMaterialStatusName());
                 inventoryAdjustmentRecord.setAdjustType(1L);
                 inventoryAdjustmentRecord.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
                 inventoryAdjustmentRecord.setMaterialCode(shelfMaterialDetail.getMaterialCode());
@@ -834,7 +836,8 @@ public class StockShelfOrderDomainService {
                 inventoryAdjustmentRecord.setStorageSectionId(materialInventory.getStorageSectionId());
                 inventoryAdjustmentRecord.setStorageLocationId(materialInventory.getStorageLocationId());
                 inventoryAdjustmentRecord.setCreateBy(loginUser.getUserid());
-                inventoryAdjustmentRecord.setCreateByName(loginUser.getUsername());
+                UserPo userPo = loginUser.getUserPo();
+                if (userPo != null) inventoryAdjustmentRecord.setCreateByName(userPo.getUserName());
                 inventoryAdjustmentRecord.setCreateTime(new Date());
                 inventoryAdjustmentRecord.setAllocationAfterQuantity(newAllocationQuantity);
                 inventoryAdjustmentRecord.setAllocationBeforeQuantity(oldAllocationQuantity);