From b33aea368ae3fa7370e031f2d85c4f4de841d7b8 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 15 Sep 2024 21:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/common/utils/WKHtmlToPdfUtil.java     |  14 +--
 .../admin/saleorder/SaleOrderController.java  |   2 +-
 .../saleorder/SaleOrderServiceImpl.java       |  27 ++--
 .../resources/templates/pdf_template.html     |   6 +-
 .../hangtag-ui-admin/src/views/Home/Index.vue | 118 +++++++++++-------
 5 files changed, 99 insertions(+), 68 deletions(-)

diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/common/utils/WKHtmlToPdfUtil.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/common/utils/WKHtmlToPdfUtil.java
index 4fac7f4..8558e18 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/common/utils/WKHtmlToPdfUtil.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/common/utils/WKHtmlToPdfUtil.java
@@ -35,15 +35,15 @@ public class WKHtmlToPdfUtil {
         } else {
             cmd.append(lunixExePath);
         }
-        cmd.append(" -L 5mm -R 5mm");
-        cmd.append(" --no-stop-slow-scripts --load-error-handling ignore");
-        cmd.append(" --enable-local-file-access");
+        //cmd.append(" -L 5mm -R 5mm");
+        //cmd.append(" --no-stop-slow-scripts --load-error-handling ignore");
+        //cmd.append(" --enable-local-file-access");
         // cmd.append(StrUtil.format(" --header-right {} --header-line --header-spacing 3", ""));
         // cmd.append(StrUtil.format(" --header-right {} --header-spacing 3", ""));
-        cmd.append(" ");
-        cmd.append("--enable-local-file-access");
-        cmd.append(" ");
-        cmd.append("--disable-smart-shrinking ");
+        //cmd.append(" ");
+        //cmd.append("--enable-local-file-access");
+        //cmd.append(" ");
+        //cmd.append("--disable-smart-shrinking ");
 
         cmd.append(" \"");
         cmd.append(srcPath);
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
index dd4f7c5..a697e32 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/saleorder/SaleOrderController.java
@@ -114,7 +114,7 @@ public class SaleOrderController {
         return success(saleOrderService.getTabsCount());
     }
 
-    @PutMapping("/updateSaleOrderBillStatus")
+    @PostMapping("/updateSaleOrderBillStatus")
     @Operation(summary = "更新销售订单的状态")
     @PreAuthorize("@ss.hasPermission('oms:sale-order:update-status')")
     public CommonResult<Boolean> updateSaleOrderBillStatus(@RequestParam("ids") List<Long> ids,
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
index d5716d8..b0e326c 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java
@@ -13,6 +13,7 @@ import cn.hangtag.module.oms.dal.dataobject.saleorder.SaleOrderDO;
 import cn.hangtag.module.oms.dal.dataobject.saleorderentry.SaleOrderEntryDO;
 import cn.hangtag.module.oms.dal.mysql.saleorder.SaleOrderMapper;
 import cn.hangtag.module.oms.dal.mysql.saleorderentry.SaleOrderEntryMapper;
+import cn.hangtag.module.oms.enums.common.BillStatusEnum;
 import cn.hangtag.module.oms.enums.saleorder.SaleOrderStatusEnum;
 import cn.hangtag.module.oms.service.produceorder.ProduceOrderService;
 import cn.hutool.core.date.DateUtil;
@@ -141,7 +142,11 @@ public class SaleOrderServiceImpl implements SaleOrderService {
 
     @Override
     public void updateSaleOrderBillStatus(List<Long> ids, String status) {
-
+        List<SaleOrderDO> saleOrders = saleOrderMapper.selectList(SaleOrderDO::getId, ids);
+        for (SaleOrderDO saleOrder : saleOrders) {
+            saleOrder.setBillStatus(BillStatusEnum.AUDIT.getValue());
+            saleOrderMapper.updateById(saleOrder);
+        }
     }
 
     @Override
@@ -191,17 +196,17 @@ public class SaleOrderServiceImpl implements SaleOrderService {
         context.setVariable("zhTotalAmount", "合共人民币"+NumberChineseFormatterUtils.convertToChinese(new BigDecimal("1891.98"))+"整");
 
 
-        for (int i = 1; i <= 3; i++) {
+        for (int i = 1; i <= 5; i++) {
             context.setVariable("item"+i, i+"");
-            context.setVariable("explain"+i, "1891.98");
-            context.setVariable("qty"+i, "1891.98");
-            context.setVariable("price"+i, "1891.98");
-            context.setVariable("discount"+i, "1891.98");
-            context.setVariable("amount"+i, "1891.98");
-            context.setVariable("deliverydate"+i, "1891.98");
-            context.setVariable("explain"+i+"1", "1891.98");
-            context.setVariable("explain"+i+"2", "1891.98");
-            context.setVariable("explain"+i+"3", "1891.98");
+            context.setVariable("explain"+i, "AXXX"+i);
+            context.setVariable("qty"+i, "1233PCS");
+            context.setVariable("price"+i, "8.12");
+            context.setVariable("discount"+i, "0");
+            context.setVariable("amount"+i, "123");
+            context.setVariable("deliverydate"+i, "2024-09-15");
+            context.setVariable("explain"+i+"1", "11111111");
+            context.setVariable("explain"+i+"2", "22222222222222");
+            context.setVariable("explain"+i+"3", "3333333333333333");
         }
 
         return templateEngine.process("pdf_template", context);
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html
index a6b1f28..3eee45b 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html
+++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/templates/pdf_template.html
@@ -12,13 +12,13 @@
         /* 内联CSS样式，确保在PDF中正确渲染 */
         body {
             font-family: "SimSun", serif;
-            padding: 20px;
+            padding: 10px;
             line-height: 1.6;
         }
 
         h1 {
             text-align: center;
-            margin-bottom: 20px;
+            margin-bottom: 10px;
             color: #333;
         }
 
@@ -45,7 +45,7 @@
         }
 
         .fixed-bottom {
-            margin-top: 100px;
+            margin-top: 150px;
         }
 
         .itemtitle {
diff --git a/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue b/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue
index 291d3e8..e98b758 100644
--- a/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/views/Home/Index.vue
@@ -1,52 +1,78 @@
-<template>
-  <div class="flex flex-col">
-    <!-- 数据对照 -->
-    <el-row :gutter="16" class="row">
-      <el-col :md="6" :sm="12" :xs="24" :loading="loading">
-        <ComparisonCard
-          tag="今日"
-          title="订单量"
-          :value="orderComparison?.value?.orderPayCount || 0"
-          :reference="orderComparison?.reference?.orderPayCount || 0"
-        />
-      </el-col>
-    </el-row>
+<!--<template>-->
+<!--  <div class="flex flex-col">-->
+<!--    &lt;!&ndash; 数据对照 &ndash;&gt;-->
+<!--    <el-row :gutter="16" class="row">-->
+<!--      <el-col :md="6" :sm="12" :xs="24" :loading="loading">-->
+<!--        <ComparisonCard-->
+<!--          tag="今日"-->
+<!--          title="订单量"-->
+<!--          :value="orderComparison?.value?.orderPayCount || 0"-->
+<!--          :reference="orderComparison?.reference?.orderPayCount || 0"-->
+<!--        />-->
+<!--      </el-col>-->
 
-  </div>
-</template>
-<script lang="ts" setup>
-import * as TradeStatisticsApi from '@/api/oms/statistics/trade'
-import {TradeOrderSummaryRespVO} from '@/api/oms/statistics/trade'
-import {DataComparisonRespVO} from '@/api/oms/statistics/common'
-import ComparisonCard from './components/ComparisonCard.vue'
+<!--      <el-col :md="6" :sm="12" :xs="24" :loading="loading">-->
+<!--        <ComparisonCard-->
+<!--          tag="本周"-->
+<!--          title="订单量"-->
+<!--          :value="orderComparison?.value?.orderPayCount || 0"-->
+<!--          :reference="orderComparison?.reference?.orderPayCount || 0"-->
+<!--        />-->
+<!--      </el-col>-->
 
-/** 商城首页 */
-defineOptions({ name: 'MallHome' })
+<!--      <el-col :md="6" :sm="12" :xs="24" :loading="loading">-->
+<!--        <ComparisonCard-->
+<!--          tag="本月"-->
+<!--          title="订单量"-->
+<!--          :value="orderComparison?.value?.orderPayCount || 0"-->
+<!--          :reference="orderComparison?.reference?.orderPayCount || 0"-->
+<!--        />-->
+<!--      </el-col>-->
+<!--      <el-col :md="6" :sm="12" :xs="24" :loading="loading">-->
+<!--        <ComparisonCard-->
+<!--          tag="本年"-->
+<!--          title="订单量"-->
+<!--          :value="orderComparison?.value?.orderPayCount || 0"-->
+<!--          :reference="orderComparison?.reference?.orderPayCount || 0"-->
+<!--        />-->
+<!--      </el-col>-->
+<!--    </el-row>-->
 
-const loading = ref(true) // 加载中
-const orderComparison = ref<DataComparisonRespVO<TradeOrderSummaryRespVO>>() // 交易对照数据
+<!--  </div>-->
+<!--</template>-->
+<!--<script lang="ts" setup>-->
+<!--import * as TradeStatisticsApi from '@/api/oms/statistics/trade'-->
+<!--import {TradeOrderSummaryRespVO} from '@/api/oms/statistics/trade'-->
+<!--import {DataComparisonRespVO} from '@/api/oms/statistics/common'-->
+<!--import ComparisonCard from './components/ComparisonCard.vue'-->
 
-/** 查询交易对照卡片数据 */
-const getOrderComparison = async () => {
-  orderComparison.value = await TradeStatisticsApi.getOrderComparison()
-}
+<!--/** 商城首页 */-->
+<!--defineOptions({ name: 'MallHome' })-->
 
-/** 查询会员用户数量对照卡片数据 */
-/*const getUserCountComparison = async () => {
-  userComparison.value = await MemberStatisticsApi.getUserCountComparison()
-}*/
+<!--const loading = ref(true) // 加载中-->
+<!--const orderComparison = ref<DataComparisonRespVO<TradeOrderSummaryRespVO>>() // 交易对照数据-->
 
-/** 初始化 **/
-onMounted(async () => {
-  loading.value = true
-  await Promise.all([getOrderComparison()])
-  loading.value = false
-})
-</script>
-<style lang="scss" scoped>
-.row {
-  .el-col {
-    margin-bottom: 1rem;
-  }
-}
-</style>
+<!--/** 查询交易对照卡片数据 */-->
+<!--const getOrderComparison = async () => {-->
+<!--  orderComparison.value = await TradeStatisticsApi.getOrderComparison()-->
+<!--}-->
+
+<!--/** 查询会员用户数量对照卡片数据 */-->
+<!--/*const getUserCountComparison = async () => {-->
+<!--  userComparison.value = await MemberStatisticsApi.getUserCountComparison()-->
+<!--}*/-->
+
+<!--/** 初始化 **/-->
+<!--onMounted(async () => {-->
+<!--  loading.value = true-->
+<!--  await Promise.all([getOrderComparison()])-->
+<!--  loading.value = false-->
+<!--})-->
+<!--</script>-->
+<!--<style lang="scss" scoped>-->
+<!--.row {-->
+<!--  .el-col {-->
+<!--    margin-bottom: 1rem;-->
+<!--  }-->
+<!--}-->
+<!--</style>-->