diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 6b9a4264..da436479 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -26,7 +26,7 @@
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html index 81d04235..dd81353c 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html @@ -388,20 +388,19 @@ function downloadTem() { var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL - // 当请求完成时执行的回调函数 - $.modal.loading("正在下载，请稍候..."); - xhr.onload = function (data) { - const url = window.URL.createObjectURL(data.currentTarget.response) - const a=document.createElement('a') - a.href= url - a.download='合同清单模板.xlsx' - document.append(a) - a.click() - a.remove() - $.modal.closeLoading(); - } - xhr.send(); + window.location.href =prefix + "/list/export" + $.modal.closeLoading(); + // $.post(prefix + "/list/export", {}, function (result) { + // if (result.code == web_status.SUCCESS) { + // window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + // } else if (result.code == web_status.WARNING) { + // $.modal.alertWarning(result.msg) + // } else { + // $.modal.alertError(result.msg); + // } + // $.modal.closeLoading(); + // }) + } document.getElementById('uploadInput').addEventListener('change', function (event) { diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html index e1ed2577..2b00786c 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html @@ -104,7 +104,7 @@
- +
- +
@@ -234,7 +234,7 @@ width: "680", url: url, height:'600', - + callBack: doSubmitPartner }; $.modal.openOptions(options); @@ -324,21 +324,19 @@ }); function downloadTem() { - var xhr = new XMLHttpRequest(); // 创建XMLHttpRequest对象 - xhr.open('post', prefix + '/list/export', true); // 设置请求类型和URL - // 当请求完成时执行的回调函数 $.modal.loading("正在下载，请稍候..."); - xhr.onload = function (data) { - const url = window.URL.createObjectURL(data.currentTarget.response) - const a=document.createElement('a') - a.href= url - a.download='合同清单模板.xlsx' - document.append(a) - a.click() - a.remove() - $.modal.closeLoading(); - } - xhr.send(); + window.location.href=prefix + "/list/export" + $.modal.closeLoading(); + // $.post(prefix + "/list/export", {}, function (result) { + // if (result.code == web_status.SUCCESS) { + // window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + // } else if (result.code == web_status.WARNING) { + // $.modal.alertWarning(result.msg) + // } else { + // $.modal.alertError(result.msg); + // } + // $.modal.closeLoading(); + // }) } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java index 786b0c8d..1dda344c 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/OrderInfoController.java @@ -178,7 +178,7 @@ public class OrderInfoController extends BaseController } @RequiresPermissions("sip:list:export") @Log(title = "发货清单", businessType = BusinessType.EXPORT) - @PostMapping("/list/export") + @GetMapping("/list/export") public void listExport(HttpServletRequest request, HttpServletResponse response) { try { diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java index cbb0ecbb..8384f5ef 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/OrderDelivery.java @@ -75,5 +75,6 @@ public class OrderDelivery extends BaseEntity /** 删除时间 */ private Date deletedAt; private String total; + private Integer status; } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java index 5eb24800..3929b874 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/mapper/OrderDeliveryMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.sip.mapper; +import java.util.Date; import java.util.List; import com.ruoyi.sip.domain.OrderDelivery; @@ -58,4 +59,6 @@ public interface OrderDeliveryMapper * @return 结果 */ public int deleteOrderDeliveryByIds(String[] ids); + + int count(OrderDelivery orderDelivery); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java index 0fa9c9bc..83218d41 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/OrderDeliveryServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.sip.service.impl; import java.util.List; + +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.sip.utils.CodeGeneratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.sip.mapper.OrderDeliveryMapper; @@ -53,6 +56,10 @@ public class OrderDeliveryServiceImpl implements IOrderDeliveryService @Override public int insertOrderDelivery(OrderDelivery orderDelivery) { + OrderDelivery queryCountParam = new OrderDelivery(); + queryCountParam.setCreatedAt(DateUtils.getNowDate()); + String deliveryCode = CodeGeneratorUtil.generateUniqueCode("OD", () -> orderDeliveryMapper.count(queryCountParam)); + orderDelivery.setDeliveryCode(deliveryCode); return orderDeliveryMapper.insertOrderDelivery(orderDelivery); } diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java new file mode 100644 index 00000000..ddb1c8d1 --- /dev/null +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/utils/CodeGeneratorUtil.java @@ -0,0 +1,59 @@ +package com.ruoyi.sip.utils; + +import cn.hutool.core.collection.CollUtil; +import com.ruoyi.common.utils.DateUtils; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.IntSupplier; + +/** + * @author : ch + * @version : 1.0 + * @ClassName : CodeGeneratorUtil + * @Description : + * @DATE : Created in 9:55 2025/5/21 + * 
       Copyright: Copyright(c) 2025
+ * 
       Company :   	紫光汇智信息技术有限公司
+ * Modification History: + * Date Author Version Discription + * -------------------------------------------------------------------------- + * 2025/05/21 ch 1.0 Why & What is modified: <修改原因描述> * + */ +public class CodeGeneratorUtil { + + private static final String DELIMITER = "-"; + private static final Map SEQUENCE_MAP = new ConcurrentHashMap<>(); + private static final Map DATE_MAP = new ConcurrentHashMap<>(); + + /** + * 生成唯一编码 + * + * @param prefix 编码前缀 + * @param defaultValueSupplier 函数式接口，返回默认值 + * @return 唯一编码 + */ + public static String generateUniqueCode(String prefix, IntSupplier defaultValueSupplier) { + // 获取当前日期（yyyyMMdd格式） + String currentDate = DateUtils.dateTime(); + if (!DATE_MAP.containsKey(currentDate)) { + DATE_MAP.clear(); + SEQUENCE_MAP.clear(); + DATE_MAP.put(currentDate, currentDate); + } + // 获取当前流水号并递增 + AtomicLong sequence = SEQUENCE_MAP.computeIfAbsent(prefix, k -> { + if (CollUtil.isEmpty(SEQUENCE_MAP)) { + return new AtomicLong(defaultValueSupplier.getAsInt()); + } else { + return new AtomicLong(0); + } + }); + long currentSequence = sequence.incrementAndGet(); + // 生成编码 + return prefix + DELIMITER + currentDate + DELIMITER + String.format("%04d", currentSequence); + } +} \ No newline at end of file diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml index d496c791..279325fa 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderDeliveryMapper.xml @@ -50,6 +50,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} + insert into order_delivery