From 2ebf9333d0a53949ff647444064a4c2b73c52fd3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 07 二月 2026 10:29:30 +0800
Subject: [PATCH] 客户需求优化调整4

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java |  249 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 248 insertions(+), 1 deletions(-)

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 159b5c2..1db2bcc 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
@@ -23,6 +23,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -257,6 +258,24 @@
     /**
      * 鏂板鍑哄叆搴撹褰�
      *
+     * @param list
+     * @return
+     */
+    public String addInoutRecordList(List<InoutRecord> list) {
+        if(null == list || list.isEmpty()){
+            return "鏂板澶辫触";
+        }
+
+        for (InoutRecord inoutRecord : list) {
+            addInoutRecord(inoutRecord);
+        }
+
+        return null;
+    }
+
+    /**
+     * 鏂板鍑哄叆搴撹褰�
+     *
      * @param data
      * @return
      */
@@ -279,7 +298,7 @@
 
         int num = inoutRecordMapper.insert(data);
         //TODO 鏇存柊缂撳瓨
-        //updateInoutCache(data);
+
         return num;
 
     }
@@ -303,6 +322,234 @@
     }
 
     /**
+     * 鏁版嵁淇敼锛屼繚鐣欎慨鏀硅褰�
+     * @param updateData
+     * @return
+     */
+    public int checkAndUpdate(InoutRecord updateData) {
+
+        //鑾峰彇鍘熸潵鐨勬暟鎹�
+        InoutParam param = new InoutParam();
+        param.setId(updateData.getId());
+        InoutRecord record = this.selectOne(param);
+
+        String remarks = checkRemarks(updateData, record);
+        updateData.setRemarks(remarks);
+
+        return updateInoutRecord(updateData);
+    }
+
+    /**
+     * 鏍￠獙淇敼淇℃伅
+     * @param updateData  淇敼鏁版嵁
+     * @param record      鍘熷鏁版嵁
+     * @return
+     */
+    public String checkRemarks(InoutRecord updateData, InoutRecord record) {
+
+        String remarks = "[" + ContextUtil.getLoginUserName() + "]淇敼鏁版嵁锛�";
+
+        boolean updateTag = false;
+        //鏍￠獙浠撳簱淇℃伅
+        if(null != updateData.getDepotId() && null != record.getDepotId()){
+            updateTag = !updateData.getDepotId().equals(record.getDepotId());
+            if(updateTag){
+                remarks += "[浠撳簱缂栫爜](" + record.getDepotId() + ")淇敼涓�(" + updateData.getDepotId() + "),";
+            }
+        }
+
+        //鏍￠獙鍝佺淇℃伅
+        if(null != updateData.getFoodVariety() && null != record.getFoodVariety()){
+            updateTag = !updateData.getFoodVariety().equals(record.getFoodVariety());
+            if(updateTag){
+                remarks += "[鍝佺](" + record.getFoodVariety() + ")淇敼涓�(" + updateData.getFoodVariety() + "),";
+            }
+        }
+
+        //绮浜у湴
+        if(null != updateData.getFoodLocation() && null != record.getFoodLocation()){
+            updateTag = !updateData.getFoodLocation().equals(record.getFoodLocation());
+            if(updateTag){
+                remarks += "[绮浜у湴](" + record.getFoodLocation() + ")淇敼涓�(" + updateData.getFoodLocation() + "),";
+            }
+        }
+
+        //绮绛夌骇
+        if(null != updateData.getFoodLevel() && null != record.getFoodLevel()){
+            updateTag = !updateData.getFoodLevel().equals(record.getFoodLevel());
+            if(updateTag){
+                remarks += "[绮绛夌骇](" + record.getFoodLevel() + ")淇敼涓�(" + updateData.getFoodLevel() + "),";
+            }
+        }
+
+        //绮骞翠唤
+        if(null != updateData.getFoodYear() && null != record.getFoodYear()){
+            updateTag = !updateData.getFoodYear().equals(record.getFoodYear());
+            if(updateTag){
+                remarks += "[绮骞翠唤](" + record.getFoodYear() + ")淇敼涓�(" + updateData.getFoodYear() + "),";
+            }
+        }
+
+        //鎵胯繍浜�
+        if(null != updateData.getUserName() && null != record.getUserName()){
+            updateTag = !updateData.getUserName().equals(record.getUserName());
+            if(updateTag){
+                remarks += "[鎵胯繍浜篯(" + record.getUserName() + ")淇敼涓�(" + updateData.getUserName() + "),";
+            }
+        }
+
+        //鏍￠獙閫氱煡鍗曚俊鎭�
+        if(null != updateData.getNoticeId() && null != record.getNoticeId()){
+            updateTag = !updateData.getNoticeId().equals(record.getNoticeId());
+            if(updateTag){
+                remarks += "[閫氱煡鍗曠紪鐮乚(" + record.getNoticeId() + ")淇敼涓�(" + updateData.getNoticeId() + "),";
+            }
+        }
+
+        //鏍￠獙寰�鏉ュ崟浣嶄俊鎭�
+        if(null != updateData.getCustomerName() && null != record.getCustomerName()){
+            updateTag = !updateData.getCustomerName().equals(record.getCustomerName());
+            if(updateTag){
+                remarks += "[寰�鏉ュ崟浣峕(" + record.getCustomerName() + ")淇敼涓�(" + updateData.getCustomerName() + "),";
+            }
+        }
+
+        //鍗曚环
+        if(null != updateData.getPrice() && null != record.getPrice()){
+            updateTag = !updateData.getPrice().equals(record.getPrice());
+            if(updateTag){
+                remarks += "[鍗曚环](" + record.getPrice() + ")淇敼涓�(" + updateData.getPrice() + "),";
+            }
+        }
+
+        //缁撶畻閲戦
+        if(null != updateData.getSettleMoney() && null != record.getSettleMoney()){
+            updateTag = !updateData.getSettleMoney().equals(record.getSettleMoney());
+            if(updateTag){
+                remarks += "[缁撶畻閲戦](" + record.getSettleMoney() + ")淇敼涓�(" + updateData.getSettleMoney() + "),";
+            }
+        }
+
+        //姘村垎
+        if(null != updateData.getPerWet() && null != record.getPerWet()){
+            updateTag = !updateData.getPerWet().equals(record.getPerWet());
+            if(updateTag){
+                remarks += "[姘村垎](" + record.getPerWet() + ")淇敼涓�(" + updateData.getPerWet() + "),";
+            }
+        }
+
+        //鏉傝川
+        if(null != updateData.getPerImpurity() && null != record.getPerImpurity()){
+            updateTag = !updateData.getPerImpurity().equals(record.getPerImpurity());
+            if(updateTag){
+                remarks += "[鏉傝川](" + record.getPerImpurity() + ")淇敼涓�(" + updateData.getPerImpurity() + "),";
+            }
+        }
+
+        //姣涢噸
+        if(null != updateData.getFullWeight() && null != record.getFullWeight()){
+            updateTag = !updateData.getFullWeight().equals(record.getFullWeight());
+            if(updateTag){
+                remarks += "[姣涢噸](" + record.getFullWeight() + ")淇敼涓�(" + updateData.getFullWeight() + "),";
+            }
+        }
+
+        //鐨噸
+        if(null != updateData.getEmptyWeight() && null != record.getEmptyWeight()){
+            updateTag = !updateData.getEmptyWeight().equals(record.getEmptyWeight());
+            if(updateTag){
+                remarks += "[鐨噸](" + record.getEmptyWeight() + ")淇敼涓�(" + updateData.getEmptyWeight() + "),";
+            }
+        }
+
+        //鎵ｉ噸
+        if(null != updateData.getDeOther() && null != record.getDeOther()){
+            updateTag = !updateData.getDeOther().equals(record.getDeOther());
+            if(updateTag){
+                remarks += "[鎵ｉ噸](" + record.getDeOther() + ")淇敼涓�(" + updateData.getDeOther() + "),";
+            }
+        }
+
+        //缁撶畻閲嶉噺
+        if(null != updateData.getSettleWeight() && null != record.getSettleWeight()){
+            updateTag = !updateData.getSettleWeight().equals(record.getSettleWeight());
+            if(updateTag){
+                remarks += "[缁撶畻閲嶉噺](" + record.getSettleWeight() + ")淇敼涓�(" + updateData.getSettleWeight() + "),";
+            }
+        }
+
+        //鍑哄叆搴撻噸閲�
+        if(null != updateData.getRecordWeight() && null != record.getRecordWeight()){
+            updateTag = !updateData.getRecordWeight().equals(record.getRecordWeight());
+            if(updateTag){
+                remarks += "[鍑哄叆搴撻噸閲廬(" + record.getRecordWeight() + ")淇敼涓�(" + updateData.getRecordWeight() + "),";
+            }
+        }
+
+        //鐧昏鏃堕棿
+        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(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(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(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(null != updateData.getFullWeightUser() && null != record.getFullWeightUser()){
+            updateTag = !updateData.getFullWeightUser().equals(record.getFullWeightUser());
+            if(updateTag){
+                remarks += "[婊¤溅绉伴噸浜篯(" + record.getFullWeightUser() + ")淇敼涓�(" + updateData.getFullWeightUser() + "),";
+            }
+        }
+
+        //绌鸿溅绉伴噸浜�
+        if(null != updateData.getEmptyWeightUser() && null != record.getEmptyWeightUser()){
+            updateTag = !updateData.getEmptyWeightUser().equals(record.getEmptyWeightUser());
+            if(updateTag){
+                remarks += "[绌鸿溅绉伴噸浜篯(" + record.getEmptyWeightUser() + ")淇敼涓�(" + updateData.getEmptyWeightUser() + "),";
+            }
+        }
+
+        //澶囨敞璇存槑
+        if(null != updateData.getRemarks() && null != record.getRemarks()){
+            updateTag = !updateData.getRemarks().equals(record.getRemarks());
+            if(updateTag){
+                remarks += "[澶囨敞璇存槑](" + record.getRemarks() + ")淇敼涓�(" + updateData.getRemarks() + "),";
+            }
+        }
+
+        if(StringUtils.isNotBlank(record.getRemarks())){
+            remarks = record.getRemarks() + ";" + remarks;
+        }
+
+        return remarks;
+    }
+
+    /**
      * 寮傚父缁堟
      *
      * @param data

--
Gitblit v1.9.3