From a013aea101294906be4af0f5081dc6f5c2878d02 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 27 十一月 2023 22:29:27 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
index f909e53..adb1634 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java
@@ -33,11 +33,13 @@
String companyId = sysUserInfo.getCompanyId();
String userId = sysUserInfo.getUserId();
String id = suMaterialWarehouseEntity.getId();
+ suMaterialWarehouseEntity.setType(1);//1手动
if(StringUtils.isNotBlank(id)){
suMaterialWarehouseEntity.setUpdateTime(new Date());
suMaterialWarehouseEntity.setUpdateUser(userId);
+ }else {
+ suMaterialWarehouseEntity.setId(UUIDUtils.create());
}
- suMaterialWarehouseEntity.setId(UUIDUtils.create());
suMaterialWarehouseEntity.setCreateUser(userId);
suMaterialWarehouseEntity.setCompanyId(companyId);
suMaterialWarehouseMapper.insertAndUpdate(suMaterialWarehouseEntity);
@@ -64,7 +66,7 @@
}
@Override
- public BasicResult selectInfo(Integer id) {
+ public BasicResult selectInfo(String id) {
return BasicResult.success(suMaterialWarehouseMapper.selectInfo(id));
}
--
Gitblit v1.9.3