From 5224b79436b16039d07a981029e330f48b3c7708 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 23 三月 2026 10:05:46 +0800
Subject: [PATCH] fix: 日期格式转换、生产订单缺少查询条件
---
src/main/resources/mapper/production/ProductOrderMapper.xml | 16 +++++++++++++++-
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java | 9 +++++++++
src/main/java/com/ruoyi/production/controller/ProductMaterialController.java | 2 +-
src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java | 3 +--
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
index 74f68be..f17b568 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
@@ -154,8 +154,7 @@
private String toUpperCasePattern(String pattern) {
if (StringUtils.isEmpty(pattern)) return "";
return pattern.replace("yyyy", "YYYY")
- .replace("dd", "DD")
- .replace("ss", "SS");
+ .replace("dd", "DD");
}
@Override
diff --git a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
index 21eddbc..d94b452 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductMaterialController.java
@@ -56,7 +56,7 @@
@GetMapping("/listQuery")
@ApiOperation("鐗╂枡鏁版嵁绫诲埆瀛愮被鏁版嵁闆嗗悎")
@Log(title = "鐗╂枡鏁版嵁绫诲埆瀛愮被鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
- public AjaxResult productMaterialListByQuery(@RequestParam(value = "materialName", required = false) String materialName, @RequestParam(value = "materialTypeId", required = false) Integer materialTypeId) {
+ public AjaxResult productMaterialListByQuery(@RequestParam(value = "productName", required = false) String materialName, @RequestParam(value = "materialTypeId", required = false) Integer materialTypeId) {
List<ProductMaterialGroupDto> productMaterialMap = productMaterialService.productMaterialListByQuery(materialName, materialTypeId);
return AjaxResult.success(productMaterialMap);
}
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
index 8cb5947..d93e298 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRouteItemParamServiceImpl.java
@@ -6,6 +6,7 @@
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.dto.ProductionOrderRouteItemParamDto;
import com.ruoyi.production.mapper.ProductionOrderRouteItemParamMapper;
import com.ruoyi.production.pojo.ProductionOrderRouteItemParam;
@@ -42,13 +43,21 @@
.eq(ProductionOrderRouteItemParam::getRouteItemId, routeItemId)
.orderByAsc(ProductionOrderRouteItemParam::getSort));
+
return list.stream().map(item -> {
ProductionOrderRouteItemParamDto dto = new ProductionOrderRouteItemParamDto();
BeanUtils.copyProperties(item, dto);
+ dto.setParamFormat(toUpperCasePattern(dto.getParamFormat()));
return dto;
}).collect(Collectors.toList());
}
+ private String toUpperCasePattern(String pattern) {
+ if (StringUtils.isEmpty(pattern)) return "";
+ return pattern.replace("yyyy", "YYYY")
+ .replace("dd", "DD");
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public void addRouteItemParam(ProductionOrderRouteItemParamDto dto) {
diff --git a/src/main/resources/mapper/production/ProductOrderMapper.xml b/src/main/resources/mapper/production/ProductOrderMapper.xml
index ed6c187..f18e454 100644
--- a/src/main/resources/mapper/production/ProductOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductOrderMapper.xml
@@ -68,9 +68,23 @@
<if test="c.startTime != null and c.endTime != null">
AND po.create_time BETWEEN #{c.startTime} AND #{c.endTime}
</if>
+ <if test="c.status != null">
+ AND po.status = #{c.status}
+ </if>
+ <if test="c.productName != null and c.productName != ''">
+ AND pm.product_name LIKE CONCAT('%', #{c.productName}, '%')
+ </if>
+ <if test="c.materialCode != null and c.materialCode != ''">
+ AND pms.material_code LIKE CONCAT('%', #{c.materialCode}, '%')
+ </if>
+ <if test="c.model != null and c.model != ''">
+ AND pms.model LIKE CONCAT('%', #{c.model}, '%')
+ </if>
+ <if test="c.strength != null and c.strength != ''">
+ AND po.strength = #{c.strength}
+ </if>
</where>
</select>
-
<select id="listProcessRoute" resultType="com.ruoyi.production.pojo.ProcessRoute">
select pr.*
from process_route pr
--
Gitblit v1.9.3