From f68f5bf6ae56c18561eb8ccba9fb9693f128551c Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 11 二月 2026 09:36:07 +0800
Subject: [PATCH] 客户问题优化调整9
---
fzzy-igdss-web/src/main/resources/templates/inout/handle.html | 26 +++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java | 3
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java | 3
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java | 3
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java | 5 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml | 2
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 177 ++++++++++++++++++-----------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 4
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 12 ++
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 16 ++
fzzy-igdss-web/src/main/resources/templates/inout/weight.html | 21 ++--
fzzy-igdss-web/src/main/resources/templates/inout/weight2.html | 21 ++--
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java | 3
13 files changed, 173 insertions(+), 123 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java
index 1b013e4..446dbc1 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailInExport.java
@@ -42,4 +42,7 @@
@Excel(name = "绂诲簱鏃堕棿",sort = 9,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
+
+ @Excel(name = "淇敼璁板綍",sort = 10)
+ private String updateLog;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java
index 73cc2a5..5a06015 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordDetailOutExport.java
@@ -42,4 +42,7 @@
@Excel(name = "绂诲簱鏃堕棿",sort = 9,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
+
+ @Excel(name = "淇敼璁板綍",sort = 10)
+ private String updateLog;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java
index 45d1f9e..43957ec 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordInExport.java
@@ -49,4 +49,7 @@
@Excel(name = "绂诲簱鏃堕棿",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
+
+ @Excel(name = "淇敼璁板綍",sort = 12)
+ private String updateLog;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java
index 3a27362..6a19648 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/InoutRecordOutExport.java
@@ -49,4 +49,7 @@
@Excel(name = "绂诲簱鏃堕棿",sort = 11,dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeTime;
+
+ @Excel(name = "淇敼璁板綍",sort = 12)
+ private String updateLog;
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
index 4625fdb..eddfab2 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/InoutRecord.java
@@ -235,6 +235,11 @@
@TableField("remarks")
private String remarks;
+ @Excel(name = "淇敼璁板綍",sort = 8)
+ @Column(name = "update_log", columnDefinition = "varchar(500) COMMENT '淇敼璁板綍'")
+ @TableField("update_log")
+ private String updateLog;
+
/**
* ----------- 鍊间粨鏃堕棿锛屾墜鏈虹浣跨敤-----------------------
**/
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index 76dcd79..8aef70c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -68,6 +68,8 @@
queryWrapper.eq("company_id", param.getCompanyId());
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
+ }else {
+ queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
}
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
@@ -267,6 +269,8 @@
queryWrapper.eq("company_id", param.getCompanyId());
if (StringUtils.isNotBlank(param.getDeptId())) {
queryWrapper.eq("dept_id", param.getDeptId());
+ }else {
+ queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
}
if (StringUtils.isNotBlank(param.getCustomerName())) {
queryWrapper.like("customer_name", param.getCustomerName());
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index d304133..e3ae15f 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.bill.InoutBill;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.constant.FoodLevel;
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.constant.RedisConst;
import com.fzzy.igds.data.IgdsBaseParam;
@@ -149,13 +150,14 @@
/**
* 鏍规嵁鏃堕棿绫诲瀷锛岃幏鍙栧凡瀹屾垚鐨勬甯稿崟鎹�
+ *
* @param timeType
* @param param
* @return
*/
public List<InoutRecord> getCompleteInoutByTime(String timeType, IgdsBaseParam param) {
- if(StringUtils.isBlank(timeType)){
- return null;
+ if (StringUtils.isBlank(timeType)) {
+ return null;
}
QueryWrapper<InoutRecord> queryWrapper = new QueryWrapper<>();
@@ -262,7 +264,7 @@
* @return
*/
public String addInoutRecordList(List<InoutRecord> list) {
- if(null == list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return "鏂板澶辫触";
}
@@ -323,6 +325,7 @@
/**
* 鏁版嵁淇敼锛屼繚鐣欎慨鏀硅褰�
+ *
* @param updateData
* @return
*/
@@ -333,220 +336,224 @@
param.setId(updateData.getId());
InoutRecord record = this.selectOne(param);
- String remarks = checkRemarks(updateData, record);
- updateData.setRemarks(remarks);
+ String updateLog = checkRemarks(updateData, record);
+ updateData.setUpdateLog(updateLog);
return updateInoutRecord(updateData);
}
/**
* 鏍￠獙淇敼淇℃伅
- * @param updateData 淇敼鏁版嵁
- * @param record 鍘熷鏁版嵁
+ *
+ * @param updateData 淇敼鏁版嵁
+ * @param record 鍘熷鏁版嵁
* @return
*/
public String checkRemarks(InoutRecord updateData, InoutRecord record) {
- String remarks = "銆�" + ContextUtil.getLoginUserName() + "銆戜簬["+DateFormatUtils.format(new Date(),"yyyy-MM-dd HH:mm:ss")+"]淇敼鏁版嵁锛�";
+ String updateLog0 = "銆�" + ContextUtil.getLoginUserName() + "銆戜簬[" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss") + "]淇敼鏁版嵁锛�";
+ String updateLog = "";
boolean updateTag = false;
//鏍￠獙浠撳簱淇℃伅
- if(null != updateData.getDepotId() && null != record.getDepotId()){
+ if (null != updateData.getDepotId() && null != record.getDepotId()) {
updateTag = !updateData.getDepotId().equals(record.getDepotId());
- if(updateTag){
- remarks += "[浠撳簱缂栫爜](" + record.getDepotId() + ")淇敼涓�(" + updateData.getDepotId() + "),";
+ if (updateTag) {
+ updateLog += "[浠撳簱缂栫爜](" + record.getDepotId() + ")淇敼涓�(" + updateData.getDepotId() + "),";
}
}
//鏍￠獙鍝佺淇℃伅
- if(null != updateData.getFoodVariety() && null != record.getFoodVariety()){
+ if (null != updateData.getFoodVariety() && null != record.getFoodVariety()) {
updateTag = !updateData.getFoodVariety().equals(record.getFoodVariety());
- if(updateTag){
- remarks += "[鍝佺](" + record.getFoodVariety() + ")淇敼涓�(" + updateData.getFoodVariety() + "),";
+ if (updateTag) {
+ updateLog += "[鍝佺](" + FoodVariety.getMsg(record.getFoodVariety()) + ")淇敼涓�(" + FoodVariety.getMsg(updateData.getFoodVariety()) + "),";
}
}
//绮浜у湴
- if(null != updateData.getFoodLocation() && null != record.getFoodLocation()){
+ if (null != updateData.getFoodLocation() && null != record.getFoodLocation()) {
updateTag = !updateData.getFoodLocation().equals(record.getFoodLocation());
- if(updateTag){
- remarks += "[绮浜у湴](" + record.getFoodLocation() + ")淇敼涓�(" + updateData.getFoodLocation() + "),";
+ if (updateTag) {
+ updateLog += "[绮浜у湴](" + record.getFoodLocation() + ")淇敼涓�(" + updateData.getFoodLocation() + "),";
}
}
//绮绛夌骇
- if(null != updateData.getFoodLevel() && null != record.getFoodLevel()){
+ if (null != updateData.getFoodLevel() && null != record.getFoodLevel()) {
updateTag = !updateData.getFoodLevel().equals(record.getFoodLevel());
- if(updateTag){
- remarks += "[绮绛夌骇](" + record.getFoodLevel() + ")淇敼涓�(" + updateData.getFoodLevel() + "),";
+ if (updateTag) {
+ updateLog += "[绮绛夌骇](" + FoodLevel.getMsg(record.getFoodLevel()) + ")淇敼涓�(" + FoodLevel.getMsg(updateData.getFoodLevel()) + "),";
}
}
//绮骞翠唤
- if(null != updateData.getFoodYear() && null != record.getFoodYear()){
+ if (null != updateData.getFoodYear() && null != record.getFoodYear()) {
updateTag = !updateData.getFoodYear().equals(record.getFoodYear());
- if(updateTag){
- remarks += "[绮骞翠唤](" + record.getFoodYear() + ")淇敼涓�(" + updateData.getFoodYear() + "),";
+ if (updateTag) {
+ updateLog += "[绮骞翠唤](" + record.getFoodYear() + ")淇敼涓�(" + updateData.getFoodYear() + "),";
}
}
//鎵胯繍浜�
- if(null != updateData.getUserName() && null != record.getUserName()){
+ if (null != updateData.getUserName() && null != record.getUserName()) {
updateTag = !updateData.getUserName().equals(record.getUserName());
- if(updateTag){
- remarks += "[鎵胯繍浜篯(" + record.getUserName() + ")淇敼涓�(" + updateData.getUserName() + "),";
+ if (updateTag) {
+ updateLog += "[鎵胯繍浜篯(" + record.getUserName() + ")淇敼涓�(" + updateData.getUserName() + "),";
}
}
//鏍￠獙閫氱煡鍗曚俊鎭�
- if(null != updateData.getNoticeId() && null != record.getNoticeId()){
+ if (null != updateData.getNoticeId() && null != record.getNoticeId()) {
updateTag = !updateData.getNoticeId().equals(record.getNoticeId());
- if(updateTag){
- remarks += "[閫氱煡鍗曠紪鐮乚(" + record.getNoticeId() + ")淇敼涓�(" + updateData.getNoticeId() + "),";
+ if (updateTag) {
+ updateLog += "[閫氱煡鍗曠紪鐮乚(" + record.getNoticeId() + ")淇敼涓�(" + updateData.getNoticeId() + "),";
}
}
//鏍￠獙寰�鏉ュ崟浣嶄俊鎭�
- if(null != updateData.getCustomerName() && null != record.getCustomerName()){
+ if (null != updateData.getCustomerName() && null != record.getCustomerName()) {
updateTag = !updateData.getCustomerName().equals(record.getCustomerName());
- if(updateTag){
- remarks += "[寰�鏉ュ崟浣峕(" + record.getCustomerName() + ")淇敼涓�(" + updateData.getCustomerName() + "),";
+ if (updateTag) {
+ updateLog += "[寰�鏉ュ崟浣峕(" + record.getCustomerName() + ")淇敼涓�(" + updateData.getCustomerName() + "),";
}
}
//鍗曚环
- if(null != updateData.getPrice() && null != record.getPrice()){
+ if (null != updateData.getPrice() && null != record.getPrice()) {
updateTag = !updateData.getPrice().equals(record.getPrice());
- if(updateTag){
- remarks += "[鍗曚环](" + record.getPrice() + ")淇敼涓�(" + updateData.getPrice() + "),";
+ if (updateTag) {
+ updateLog += "[鍗曚环](" + record.getPrice() + ")淇敼涓�(" + updateData.getPrice() + "),";
}
}
//缁撶畻閲戦
- if(null != updateData.getSettleMoney() && null != record.getSettleMoney()){
+ if (null != updateData.getSettleMoney() && null != record.getSettleMoney()) {
updateTag = !updateData.getSettleMoney().equals(record.getSettleMoney());
- if(updateTag){
- remarks += "[缁撶畻閲戦](" + record.getSettleMoney() + ")淇敼涓�(" + updateData.getSettleMoney() + "),";
+ if (updateTag) {
+ updateLog += "[缁撶畻閲戦](" + record.getSettleMoney() + ")淇敼涓�(" + updateData.getSettleMoney() + "),";
}
}
//姘村垎
- if(null != updateData.getPerWet() && null != record.getPerWet()){
+ if (null != updateData.getPerWet() && null != record.getPerWet()) {
updateTag = !updateData.getPerWet().equals(record.getPerWet());
- if(updateTag){
- remarks += "[姘村垎](" + record.getPerWet() + ")淇敼涓�(" + updateData.getPerWet() + "),";
+ if (updateTag) {
+ updateLog += "[姘村垎](" + record.getPerWet() + ")淇敼涓�(" + updateData.getPerWet() + "),";
}
}
//鏉傝川
- if(null != updateData.getPerImpurity() && null != record.getPerImpurity()){
+ if (null != updateData.getPerImpurity() && null != record.getPerImpurity()) {
updateTag = !updateData.getPerImpurity().equals(record.getPerImpurity());
- if(updateTag){
- remarks += "[鏉傝川](" + record.getPerImpurity() + ")淇敼涓�(" + updateData.getPerImpurity() + "),";
+ if (updateTag) {
+ updateLog += "[鏉傝川](" + record.getPerImpurity() + ")淇敼涓�(" + updateData.getPerImpurity() + "),";
}
}
//姣涢噸
- if(null != updateData.getFullWeight() && null != record.getFullWeight()){
+ if (null != updateData.getFullWeight() && null != record.getFullWeight()) {
updateTag = !updateData.getFullWeight().equals(record.getFullWeight());
- if(updateTag){
- remarks += "[姣涢噸](" + record.getFullWeight() + ")淇敼涓�(" + updateData.getFullWeight() + "),";
+ if (updateTag) {
+ updateLog += "[姣涢噸](" + record.getFullWeight() + ")淇敼涓�(" + updateData.getFullWeight() + "),";
}
}
//鐨噸
- if(null != updateData.getEmptyWeight() && null != record.getEmptyWeight()){
+ if (null != updateData.getEmptyWeight() && null != record.getEmptyWeight()) {
updateTag = !updateData.getEmptyWeight().equals(record.getEmptyWeight());
- if(updateTag){
- remarks += "[鐨噸](" + record.getEmptyWeight() + ")淇敼涓�(" + updateData.getEmptyWeight() + "),";
+ if (updateTag) {
+ updateLog += "[鐨噸](" + record.getEmptyWeight() + ")淇敼涓�(" + updateData.getEmptyWeight() + "),";
}
}
//鎵ｉ噸
- if(null != updateData.getDeOther() && null != record.getDeOther()){
+ if (null != updateData.getDeOther() && null != record.getDeOther()) {
updateTag = !updateData.getDeOther().equals(record.getDeOther());
- if(updateTag){
- remarks += "[鎵ｉ噸](" + record.getDeOther() + ")淇敼涓�(" + updateData.getDeOther() + "),";
+ if (updateTag) {
+ updateLog += "[鎵ｉ噸](" + record.getDeOther() + ")淇敼涓�(" + updateData.getDeOther() + "),";
}
}
//缁撶畻閲嶉噺
- if(null != updateData.getSettleWeight() && null != record.getSettleWeight()){
+ if (null != updateData.getSettleWeight() && null != record.getSettleWeight()) {
updateTag = !updateData.getSettleWeight().equals(record.getSettleWeight());
- if(updateTag){
- remarks += "[缁撶畻閲嶉噺](" + record.getSettleWeight() + ")淇敼涓�(" + updateData.getSettleWeight() + "),";
+ if (updateTag) {
+ updateLog += "[缁撶畻閲嶉噺](" + record.getSettleWeight() + ")淇敼涓�(" + updateData.getSettleWeight() + "),";
}
}
//鍑哄叆搴撻噸閲�
- if(null != updateData.getRecordWeight() && null != record.getRecordWeight()){
+ if (null != updateData.getRecordWeight() && null != record.getRecordWeight()) {
updateTag = !updateData.getRecordWeight().equals(record.getRecordWeight());
- if(updateTag){
- remarks += "[鍑哄叆搴撻噸閲廬(" + record.getRecordWeight() + ")淇敼涓�(" + updateData.getRecordWeight() + "),";
+ if (updateTag) {
+ updateLog += "[鍑哄叆搴撻噸閲廬(" + record.getRecordWeight() + ")淇敼涓�(" + updateData.getRecordWeight() + "),";
}
}
//鐧昏鏃堕棿
- if(null != updateData.getRegisterTime() && null != record.getRegisterTime()){
+ if (null != updateData.getRegisterTime() && null != record.getRegisterTime()) {
updateTag = !updateData.getRegisterTime().equals(record.getRegisterTime());
- if(updateTag){
- remarks += "[鐧昏鏃堕棿](" + DateFormatUtils.format(record.getRegisterTime(),"yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getRegisterTime(),"yyyy-MM-dd HH:mm:ss") + "),";
+ if (updateTag) {
+ updateLog += "[鐧昏鏃堕棿](" + DateFormatUtils.format(record.getRegisterTime(), "yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getRegisterTime(), "yyyy-MM-dd HH:mm:ss") + "),";
}
}
//婊¤溅鏃堕棿
- if(null != updateData.getFullWeightTime() && null != record.getFullWeightTime()){
+ if (null != updateData.getFullWeightTime() && null != record.getFullWeightTime()) {
updateTag = !updateData.getFullWeightTime().equals(record.getFullWeightTime());
- if(updateTag){
- remarks += "[婊¤溅鏃堕棿](" + DateFormatUtils.format(record.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getFullWeightTime(),"yyyy-MM-dd HH:mm:ss") + "),";
+ if (updateTag) {
+ updateLog += "[婊¤溅鏃堕棿](" + DateFormatUtils.format(record.getFullWeightTime(), "yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getFullWeightTime(), "yyyy-MM-dd HH:mm:ss") + "),";
}
}
//绌鸿溅鏃堕棿
- if(null != updateData.getEmptyWeightTime() && null != record.getEmptyWeightTime()){
+ if (null != updateData.getEmptyWeightTime() && null != record.getEmptyWeightTime()) {
updateTag = !updateData.getEmptyWeightTime().equals(record.getEmptyWeightTime());
- if(updateTag){
- remarks += "[绌鸿溅鏃堕棿](" + DateFormatUtils.format(record.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getEmptyWeightTime(),"yyyy-MM-dd HH:mm:ss") + "),";
+ if (updateTag) {
+ updateLog += "[绌鸿溅鏃堕棿](" + DateFormatUtils.format(record.getEmptyWeightTime(), "yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getEmptyWeightTime(), "yyyy-MM-dd HH:mm:ss") + "),";
}
}
//瀹屾垚鏃堕棿
- if(null != updateData.getCompleteTime() && null != record.getCompleteTime()){
+ if (null != updateData.getCompleteTime() && null != record.getCompleteTime()) {
updateTag = !updateData.getCompleteTime().equals(record.getCompleteTime());
- if(updateTag){
- remarks += "[瀹屾垚鏃堕棿](" + DateFormatUtils.format(record.getCompleteTime(),"yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getCompleteTime(),"yyyy-MM-dd HH:mm:ss") + "),";
+ if (updateTag) {
+ updateLog += "[瀹屾垚鏃堕棿](" + DateFormatUtils.format(record.getCompleteTime(), "yyyy-MM-dd HH:mm:ss") + ")淇敼涓�(" + DateFormatUtils.format(updateData.getCompleteTime(), "yyyy-MM-dd HH:mm:ss") + "),";
}
}
//婊¤溅绉伴噸浜�
- if(null != updateData.getFullWeightUser() && null != record.getFullWeightUser()){
+ if (null != updateData.getFullWeightUser() && null != record.getFullWeightUser()) {
updateTag = !updateData.getFullWeightUser().equals(record.getFullWeightUser());
- if(updateTag){
- remarks += "[婊¤溅绉伴噸浜篯(" + record.getFullWeightUser() + ")淇敼涓�(" + updateData.getFullWeightUser() + "),";
+ if (updateTag) {
+ updateLog += "[婊¤溅绉伴噸浜篯(" + record.getFullWeightUser() + ")淇敼涓�(" + updateData.getFullWeightUser() + "),";
}
}
//绌鸿溅绉伴噸浜�
- if(null != updateData.getEmptyWeightUser() && null != record.getEmptyWeightUser()){
+ if (null != updateData.getEmptyWeightUser() && null != record.getEmptyWeightUser()) {
updateTag = !updateData.getEmptyWeightUser().equals(record.getEmptyWeightUser());
- if(updateTag){
- remarks += "[绌鸿溅绉伴噸浜篯(" + record.getEmptyWeightUser() + ")淇敼涓�(" + updateData.getEmptyWeightUser() + "),";
+ if (updateTag) {
+ updateLog += "[绌鸿溅绉伴噸浜篯(" + record.getEmptyWeightUser() + ")淇敼涓�(" + updateData.getEmptyWeightUser() + "),";
}
}
//澶囨敞璇存槑
- if(null != updateData.getRemarks() && null != record.getRemarks()){
+ if (null != updateData.getRemarks() && null != record.getRemarks()) {
updateTag = !updateData.getRemarks().equals(record.getRemarks());
- if(updateTag){
- remarks += "[澶囨敞璇存槑](" + record.getRemarks() + ")淇敼涓�(" + updateData.getRemarks() + "),";
+ if (updateTag) {
+ updateLog += "[澶囨敞璇存槑](" + record.getRemarks() + ")淇敼涓�(" + updateData.getRemarks() + "),";
}
}
- if(StringUtils.isNotBlank(record.getRemarks())){
- remarks = record.getRemarks() + ";" + remarks;
+ if (StringUtils.isBlank(updateLog)) {
+ return record.getUpdateLog() == null ? "" : record.getUpdateLog();
}
- return remarks;
+ updateLog0 = updateLog0 + updateLog;
+
+ return record.getUpdateLog() == null ? updateLog0 : (record.getUpdateLog() + "锛�" + updateLog0);
}
/**
@@ -681,7 +688,7 @@
public String inWeightBill(InoutRecord data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- InoutPrintBill bill = this.createBillData(data, "鍏ュ簱鍒掔爜鍗�");
+ InoutPrintBill bill = this.createBillData(data, "-鍏ュ簱鍗�");
// 璋冩暣妯＄増鏁版嵁骞惰繑鍥�
String htmlStr = InoutBill.IN_WEIGHT_DEFAULT;
@@ -763,7 +770,7 @@
*/
public String outWeightBill(InoutRecord data) {
// 鑾峰彇琛ㄥ崟鏁版嵁
- InoutPrintBill bill = this.createBillData(data, "鍑哄簱鍒掔爜鍗�");
+ InoutPrintBill bill = this.createBillData(data, "-鍑哄簱鍗�");
//榛樿妯＄増
String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index 77bd8f7..7e517c5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -123,7 +123,7 @@
</PropertyDef>
<PropertyDef name="settleWeight">
<Property name="dataType">Double</Property>
- <Property name="label">缁撶畻鍑�閲�</Property>
+ <Property name="label">缁撶畻閲嶉噺</Property>
<Property name="required">true</Property>
<Property name="displayFormat">0.0 KG</Property>
</PropertyDef>
@@ -156,6 +156,10 @@
<PropertyDef name="remarks">
<Property></Property>
<Property name="label">澶囨敞淇℃伅</Property>
+ </PropertyDef>
+ <PropertyDef name="updateLog">
+ <Property></Property>
+ <Property name="label">淇敼璁板綍</Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
@@ -952,6 +956,12 @@
<Property name="property">remarks</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
+ <Property name="name">updateLog</Property>
+ <Property name="property">updateLog</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
index 0fc520a..1743359 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticeOut.view.xml
@@ -228,7 +228,7 @@
<Button>
<ClientEvent name="onClick">var data = view.get("#dsQuery.data");
if(data){
- view.get("#dsMain").set("parameter",data.toJSON()).flushAsync();
+ view.get("#dsMain").set("parameter",data).flushAsync();
}else{
view.get("#dsMain").flushAsync();
}</ClientEvent>
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
index 1f8ed16..3baa207 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
@@ -136,8 +136,9 @@
sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordInExport> exportList = new ArrayList<>();
+ InoutRecordInExport export;
for (InoutRecord record : list) {
- InoutRecordInExport export = new InoutRecordInExport();
+ export = new InoutRecordInExport();
export.setId(record.getId());
export.setPlateNum(record.getPlateNum());
// 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
@@ -153,6 +154,7 @@
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
@@ -163,8 +165,9 @@
sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordOutExport> exportList = new ArrayList<>();
+ InoutRecordOutExport export;
for (InoutRecord record : list) {
- InoutRecordOutExport export = new InoutRecordOutExport();
+ export = new InoutRecordOutExport();
export.setId(record.getId());
export.setPlateNum(record.getPlateNum());
// 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
@@ -180,6 +183,7 @@
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
export.setDeOther(record.getDeOther());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
@@ -190,8 +194,9 @@
sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordDetailInExport> exportList = new ArrayList<>();
+ InoutRecordDetailInExport export;
for (InoutRecord record : list) {
- InoutRecordDetailInExport export = new InoutRecordDetailInExport();
+ export = new InoutRecordDetailInExport();
//鏀跺偍鍏徃鏄犲皠
String companyNameValue = companyMap.get(record.getCompanyId());
export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -209,6 +214,7 @@
export.setSettleWeight(record.getSettleWeight());
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
@@ -219,8 +225,9 @@
sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
list = reportInoutPR.listRecord(param);
List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
+ InoutRecordDetailOutExport export;
for (InoutRecord record : list) {
- InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
+ export = new InoutRecordDetailOutExport();
//鏀跺偍鍏徃鏄犲皠
String companyNameValue = companyMap.get(record.getCompanyId());
export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -238,6 +245,7 @@
export.setSettleWeight(record.getSettleWeight());
export.setRecordWeight(record.getRecordWeight());
export.setCompleteTime(record.getCompleteTime());
+ export.setUpdateLog(record.getUpdateLog());
exportList.add(export);
}
ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/handle.html b/fzzy-igdss-web/src/main/resources/templates/inout/handle.html
index 147998d..6b7a3ac 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/handle.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/handle.html
@@ -399,22 +399,13 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
+ <div class="layui-col-xs4 display-none">
<div class="layui-form-item">
<label class="layui-form-label">鍏ュ簱閲嶉噺</label>
<div class="layui-input-block">
<input type="text" name="recordWeight" placeholder="鑷姩璁＄畻锛屼笉鍙紪杈�"
autocomplete="off" class="layui-input rkbk-search-input"
disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs8">
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
- <div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
</div>
</div>
</div>
@@ -425,6 +416,15 @@
<input type="text" name="settleWeight" placeholder="鑷姩璁＄畻锛屼笉鍙紪杈�"
autocomplete="off" class="layui-input rkbk-search-input"
disabled> <em class="kccz-data-dw">KG</em>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
</div>
</div>
</div>
@@ -576,6 +576,12 @@
</body>
+<!-- 寮瑰嚭閫氱煡鍗� -->
+<div class="layui-tab-content" id="listNotice" style="display: none;">
+ <table class="layui-table" lay-skin="nob" id="tableNotice"
+ lay-filter="tableNotice" style="margin: 0px;"></table>
+</div>
+
<!-- 寮瑰嚭绮浜у湴 -->
<div class="layui-tab-content" id="listFoodLocation" style="display: none;">
<table class="layui-table" lay-skin="nob" id="tableFoodLoaction"
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/weight.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
index afafc0a..7e58adf 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight.html
@@ -487,22 +487,13 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
+ <div class="layui-col-xs4 display-none">
<div class="layui-form-item">
<label class="layui-form-label">鍏ュ簱閲嶉噺</label>
<div class="layui-input-block">
<input type="text" name="recordWeight" placeholder="鑷姩璁＄畻锛屼笉鍙紪杈�"
autocomplete="off" class="layui-input rkbk-search-input"
disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs8">
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
- <div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
</div>
</div>
</div>
@@ -516,7 +507,15 @@
</div>
</div>
</div>
-
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs12">
<div class="line-container" style="margin: 10px 0 0 0;">
<div class="line"></div>
diff --git a/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
index 3566325..543000a 100644
--- a/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
+++ b/fzzy-igdss-web/src/main/resources/templates/inout/weight2.html
@@ -694,22 +694,13 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
+ <div class="layui-col-xs4 display-none">
<div class="layui-form-item">
<label class="layui-form-label">鍏ュ簱閲嶉噺</label>
<div class="layui-input-block">
<input type="text" name="recordWeight" placeholder="鑷姩璁＄畻锛屼笉鍙紪杈�"
autocomplete="off" class="layui-input rkbk-search-input"
disabled> <em class="kccz-data-dw">KG</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs8">
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
- <div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
</div>
</div>
</div>
@@ -723,7 +714,15 @@
</div>
</div>
</div>
-
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
<div class="layui-col-xs12">
<div class="line-container" id="text-info">
<div class="line"></div>
--
Gitblit v1.9.3