diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstoragelog/RawStorageLogDO.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstoragelog/RawStorageLogDO.java
index 8dec001..bf93a21 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstoragelog/RawStorageLogDO.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/dal/dataobject/rawstoragelog/RawStorageLogDO.java
@@ -1,9 +1,9 @@
package com.ningxia.yunxi.chemmes.module.biz.dal.dataobject.rawstoragelog;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.KeySequence;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDO;
import com.ningxia.yunxi.chemmes.framework.mybatis.core.dataobject.BaseDOWithoutLogic;
import lombok.*;
@@ -28,7 +28,7 @@ public class RawStorageLogDO extends BaseDOWithoutLogic {
/**
* 主键id
*/
- @TableId
+ @TableId(type = IdType.AUTO)
private Integer id;
/**
* 入/出库Id
@@ -159,9 +159,4 @@ public class RawStorageLogDO extends BaseDOWithoutLogic {
*/
private Integer relarionDetailId;
private String inventBillNo;
-
-
-
-
-
}
diff --git a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java
index e3a4ac7..6db8b56 100644
--- a/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java
+++ b/mes-module-chemmes/mes-module-chemmes-biz/src/main/java/com/ningxia/yunxi/chemmes/module/biz/service/rawstorage/RawStorageServiceImpl.java
@@ -366,8 +366,8 @@ public class RawStorageServiceImpl implements RawStorageService {
RawStorageInventoryDO rawStorageInventoryDO = new RawStorageInventoryDO();
rawStorageInventoryDO.setStoreHouseId(purReceipt.getStoreHouseId());
rawStorageInventoryDO.setStoreAreaId(detail.getStoreAreaId());
- rawStorageInventoryDO.setStoreHouseCd(detail.getStoreAreCd());
- rawStorageInventoryDO.setStoreHouseName(detail.getStoreAreaName());
+ rawStorageInventoryDO.setStoreHouseCd(purReceipt.getStoreHouseCd());
+ rawStorageInventoryDO.setStoreHouseName(purReceipt.getStoreHouseName());
rawStorageInventoryDO.setStoreAreCd(detail.getStoreAreCd());
rawStorageInventoryDO.setStoreAreaName(detail.getStoreAreaName());
rawStorageInventoryDO.setMaterialId(detail.getMaterialId());
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue
index 9bd4ff6..a37cbe0 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/biz/rawstorageinventory/index.vue
@@ -73,7 +73,11 @@
-
+
+
+ {{ scope.row.checkResult === '0' ? '合格' : scope.row.checkResult === '1' ? '不合格' : scope.row.checkResult === '2' ? '让步接收' : scope.row.checkResult }}
+
+