From def672ad751adb6c08c388ba065e395c74de6c4e Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 16 十一月 2023 10:16:08 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml | 20 +++++++++++++++++++-
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java | 7 +++++--
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/service/impl/SuMaterialWarehouseServiceImpl.java | 7 +++++--
3 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
index 03e9161..606c4c6 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/suMaterialWarehouse/entity/SuMaterialWarehouseEntity.java
@@ -1,5 +1,6 @@
package com.thhy.materials.modules.biz.suMaterialWarehouse.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,10 +19,10 @@
@Builder
public class SuMaterialWarehouseEntity {
- private Integer id;
+ private String id;
private Integer tableNum;//桌号
-
+ private String nameOfOrigin;//场地名称
private String materialName;//物料名称
private Integer incomingQuantity;//进厂数量
@@ -30,6 +31,7 @@
private Integer status;//检验状态
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date inspectionDate;//检验日期
private String reportNumber;//报告编号
@@ -44,6 +46,7 @@
private String companyId;
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date inTime;//进厂日期
private Integer type;//入库方式 1手动 2自动
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 1e8d274..f909e53 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
@@ -4,10 +4,12 @@
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
import com.thhy.general.config.SysUserInfo;
+import com.thhy.general.utils.UUIDUtils;
import com.thhy.general.utils.UserInfoUtils;
import com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity;
import com.thhy.materials.modules.biz.suMaterialWarehouse.mapper.SuMaterialWarehouseMapper;
import com.thhy.materials.modules.biz.suMaterialWarehouse.service.SuMaterialWarehouseService;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -30,11 +32,12 @@
SysUserInfo sysUserInfo = UserInfoUtils.getInstance().getUserInfo();
String companyId = sysUserInfo.getCompanyId();
String userId = sysUserInfo.getUserId();
- Integer id = suMaterialWarehouseEntity.getId();
- if(id != null){
+ String id = suMaterialWarehouseEntity.getId();
+ if(StringUtils.isNotBlank(id)){
suMaterialWarehouseEntity.setUpdateTime(new Date());
suMaterialWarehouseEntity.setUpdateUser(userId);
}
+ suMaterialWarehouseEntity.setId(UUIDUtils.create());
suMaterialWarehouseEntity.setCreateUser(userId);
suMaterialWarehouseEntity.setCompanyId(companyId);
suMaterialWarehouseMapper.insertAndUpdate(suMaterialWarehouseEntity);
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
index deb220b..ffb5048 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/SuMaterialWarehouseMapper.xml
@@ -6,6 +6,12 @@
<insert id="insertAndUpdate">
insert ignore into t_su_material_warehouse_record
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ id,
+ </if>
+ <if test="nameOfOrigin != null">
+ name_of_origin,
+ </if>
<if test="tableNum != null">
table_num,
</if>
@@ -47,6 +53,12 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">
+ #{id,jdbcType=VARCHAR},
+ </if>
+ <if test="nameOfOrigin != null">
+ #{nameOfOrigin,jdbcType=VARCHAR},
+ </if>
<if test="tableNum != null">
#{tableNum,jdbcType=INTEGER},
</if>
@@ -89,6 +101,9 @@
</trim>
on duplicate key update
<trim suffixOverrides=",">
+ <if test="nameOfOrigin != null">
+ name_of_origin = #{nameOfOrigin,jdbcType=VARCHAR},
+ </if>
<if test="tableNum != null">
table_num = #{tableNum,jdbcType=INTEGER},
</if>
@@ -138,6 +153,7 @@
<select id="selectPageList" resultType="com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity">
SELECT
t.id AS id,
+ t.name_of_origin AS nameOfOrigin,
t.table_num AS tableNum,
sd.dict_name AS materialName,
t.incoming_quantity AS incomingQuantity,
@@ -155,13 +171,14 @@
LEFT JOIN sys_users su1 on su1.user_id = t.update_user
LEFT JOIN sys_dict sd on sd.dict_id = t.material_name
where t.is_use = 1 and t.company_id = #{companyId}
- order by
+ order by t.create_time desc
</select>
<select id="selectInfo" resultType="com.thhy.materials.modules.biz.suMaterialWarehouse.entity.SuMaterialWarehouseEntity">
SELECT
t.id AS id,
+ t.name_of_origin AS nameOfOrigin,
t.table_num AS tableNum,
sd.dict_name AS materialName,
t.incoming_quantity AS incomingQuantity,
@@ -186,6 +203,7 @@
t.id AS id,
t.table_num AS tableNum,
+ t.name_of_origin AS nameOfOrigin,
sd.dict_name AS materialName,
t.incoming_quantity AS incomingQuantity,
t.create_time AS createTime,
--
Gitblit v1.9.3