From d0732df41e67fc388e2d47cbe6a5f6112c162fb2 Mon Sep 17 00:00:00 2001 From: zxy Date: Mon, 8 Jun 2026 17:09:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(rawstorageinventory):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=BA=93=E5=AD=98=E6=9F=A5=E8=AF=A2=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=B9=B6=E9=9B=86=E6=88=90=E6=A3=80=E9=AA=8C=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dal/dataobject/rawstoragelog/RawStorageLogDO.java | 9 ++------- .../biz/service/rawstorage/RawStorageServiceImpl.java | 4 ++-- .../src/views/biz/rawstorageinventory/index.vue | 6 +++++- 3 files changed, 9 insertions(+), 10 deletions(-) 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 @@ - + + +