From 36aea6acd5ec532f5e6fcb530debd174a28cd450 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 08 十二月 2025 15:35:37 +0800
Subject: [PATCH] 出入库结算及单据打印

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java |   76 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 3 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 21012e6..ab051fd 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
@@ -14,6 +14,7 @@
 import com.fzzy.igds.mapper.InoutRecordMapper;
 import com.fzzy.igds.utils.ContextUtil;
 import com.fzzy.igds.utils.DateUtil;
+import com.fzzy.igds.utils.MoneyUtil;
 import com.fzzy.igds.utils.NumberUtil;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.redis.RedisCache;
@@ -23,6 +24,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.List;
@@ -124,15 +126,16 @@
         if (StringUtils.isNotBlank(param.getType())) {
             queryWrapper.eq("type", param.getType());
         }
+        if (StringUtils.isNotBlank(param.getSettleTag())) {
+            queryWrapper.eq("settle_tag", param.getSettleTag());
+        }
         if (null != param.getStart()) {
             queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
         }
         if (null != param.getEnd()) {
             queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
         }
-        queryWrapper.eq("record_status", Constant.RECORD_STATUS_NORMAL); //姝ｅ父鐘舵�佺殑鍗曞瓙
-        queryWrapper.or();
-        queryWrapper.eq("record_status", Constant.RECORD_STATUS_ADD); //琛ュ綍鍗曞瓙鐨勫崟瀛�
+        queryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //涓嶆槸鍒犻櫎鐨勫崟瀛愶紝鍗虫甯哥殑鍗曞瓙
         queryWrapper.orderByDesc("create_time");
 
         return queryWrapper;
@@ -649,4 +652,71 @@
         return bill;
     }
 
+    /**
+     * 鑾峰彇缁撶畻鍗�
+     *
+     * @param
+     * @return
+     */
+    public String printPay(InoutRecord data) {
+
+        // 璋冩暣妯＄増鏁版嵁骞惰繑鍥�
+        String htmlStr = InoutBill.IN_SETTLE_DEFAULT;
+        //鏍囬
+        //娓呰繙鍑哄彂璐у崟浣嶅強鏍囬锛屼娇鐢ㄥ叕鍙稿悕
+        String billTitle = data.getType().equals("IN") ? "鍏ュ簱缁撶畻鍗�" : "鍑哄簱缁撶畻鍗�";
+
+        htmlStr = htmlStr.replace("[billTitle]", billTitle);
+        //搴撳尯鍚嶇О
+        SysDept dept = sysDeptService.getCacheDept(data.getCompanyId(), data.getDeptId());
+        if (dept != null) {
+            htmlStr = htmlStr.replace("[deptId]", null == data.getDeptId() ? "" : dept.getDeptName());
+        } else {
+            htmlStr = htmlStr.replace("[deptId]", "");
+        }
+
+        //涓氬姟鍗曞彿
+        htmlStr = htmlStr.replace("[id]", data.getId());
+        //鎵撳嵃鏃堕棿
+        htmlStr = htmlStr.replace("[payTime]", null == data.getSettleTime() ? "" : DateFormatUtils.format(data.getSettleTime(), "yyyy骞碝M鏈坉d鏃�"));
+        //瀹㈡埛鍚嶇О
+        htmlStr = htmlStr.replace("[customerName]", null == data.getCustomerName() ? "" : data.getCustomerName());
+        //鎵胯繍浜�
+        htmlStr = htmlStr.replace("[userName]", null == data.getUserName() ? "" : data.getUserName());
+        //鎵胯繍浜鸿仈绯荤數璇�
+        htmlStr = htmlStr.replace("[userContact]", null == data.getUserContact() ? "" : data.getUserContact());
+        //鎵胯繍浜鸿韩浠借瘉鍙�
+        htmlStr = htmlStr.replace("[userId]", null == data.getUserId() ? "" : data.getUserId());
+        //鎵胯繍浜鸿溅鐗屽彿
+        htmlStr = htmlStr.replace("[plateNum]", null == data.getPlateNum() ? "" : data.getPlateNum());
+        //鑾峰彇浠撳簱淇℃伅
+        Depot depot = depotService.getCacheDepot(data.getCompanyId(), data.getDepotId());
+        if (null != depot) {
+            //璐т綅淇℃伅
+            htmlStr = htmlStr.replace("[depotId]", depot.getName());
+        }
+        //绮鍚嶇О
+        htmlStr = htmlStr.replace("[foodVariety]", null == data.getFoodVariety() ? "" : FoodVariety.getMsg(data.getFoodVariety()));
+
+        //澶囨敞
+        htmlStr = htmlStr.replace("[remark]", null == data.getRemarks() ? "" : data.getRemarks());
+        //姣涢噸
+        htmlStr = htmlStr.replace("[fullWeight]", null == data.getFullWeight() ? "" : String.format("%.2f", data.getFullWeight()));
+        //鐨噸
+        htmlStr = htmlStr.replace("[emptyWeight]", null == data.getEmptyWeight() ? "" : String.format("%.2f", data.getEmptyWeight()));
+        //鎵ｉ噸
+        htmlStr = htmlStr.replace("[deOther]", null == data.getDeOther() ? "" : String.format("%.2f", data.getDeOther()));
+        //绮补浠锋牸
+        htmlStr = htmlStr.replace("[payPrice]", null == data.getPrice() ? "" : String.format("%.3f", data.getPrice()));
+        //缁撶畻閲嶉噺
+        htmlStr = htmlStr.replace("[settleWeight]", String.format("%.2f", data.getSettleWeight()));
+        //缁撶畻閲戦
+        htmlStr = htmlStr.replace("[payMoney]", null == data.getSettleMoney() ? "" : String.format("%.3f", data.getSettleMoney()));
+
+        //缁撶畻閲嶉噺鍚嶇О
+        htmlStr = htmlStr.replace("[payMoneyName]", MoneyUtil.formatToCN(new BigDecimal(String.format("%.2f", data.getSettleMoney()))));
+
+        return htmlStr;
+    }
+
 }

--
Gitblit v1.9.3