Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

新增机台下拉选项接口

Browse Source
This commit is contained in:
yangsb
2024-04-29 09:10:30 +08:00
parent 8bdeb8ae49
commit 2d7dd7cbfb
7 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
+6 -6
View File
@@ -32,17 +32,17 @@ public class OrderPageReqVOCopy extends PageParam {
@Schema(description = "状态列表")
private List<Integer> stateList;
@Schema(description = "矩形")
private boolean rectangle;
private Boolean rectangle;
@Schema(description = "异形")
private boolean specialShaped;
private Boolean specialShaped;
@Schema(description = "造型")
private boolean sculpt;
private Boolean sculpt;
@Schema(description = "有挖穿造型")
private boolean holeThrough;
private Boolean holeThrough;
@Schema(description = "有挖穿孔")
private boolean burrow;
private Boolean burrow;
@Schema(description = "有二维纹路")
private boolean twoDimensionalToolPath;
private Boolean twoDimensionalToolPath;
@Schema(description = "开始时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private Date beginDate;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java
+3 -3
View File
@@ -249,13 +249,13 @@ public class PlanServiceImpl implements PlanService {
.isNull("d.order_id")
;
List<Integer> filterTypes = new ArrayList<>();
if (pageReqVO.isHoleThrough()) {
if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
filterTypes.add(1);
}
if (pageReqVO.isBurrow()) {
if (Objects.nonNull(pageReqVO.getBurrow()) && pageReqVO.getBurrow()) {
filterTypes.add(2);
}
if (pageReqVO.isTwoDimensionalToolPath()) {
if (Objects.nonNull(pageReqVO.getTwoDimensionalToolPath()) && pageReqVO.getTwoDimensionalToolPath()) {
filterTypes.add(4);
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+2 -1
View File
@@ -7,8 +7,9 @@
count(c.id) as num, sum(c.area) as area, p.goods_name, p.color, p.material, p.goods_id
from `order` a
left join order_plate c ON a.id = c.order_id and c.is_cancel = 0
left join plate p on c.goods_id = p.goods_id
left join order_goods p on c.goods_id = p.goods_id
left join order_item d ON c.order_id = d.order_id
left join order_plan_item e on d.id = e.item_id
${ew.customSqlSegment}
group by orderId, p.id
</select>