From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 07 七月 2025 19:42:26 +0800 Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了,单据状态还是作业中,现在作业中的单据是可以删除的,我不小心把这个单据删除了,怎么恢复? 36.每个界面点下一页都没反应,点第二页是有变化的,之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息(客户名称、收件人、地址、电话等),现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/OrderOutBatchPreviewDto.java | 112 ++++++++++++++++++++++++++++---------------------------- 1 files changed, 56 insertions(+), 56 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/OrderOutBatchPreviewDto.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/OrderOutBatchPreviewDto.java index b0b5e32..767034e 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/OrderOutBatchPreviewDto.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/dto/OrderOutBatchPreviewDto.java @@ -1,56 +1,56 @@ -package com.zy.asrs.wms.asrs.entity.dto; - -import com.zy.asrs.framework.common.Cools; -import com.zy.asrs.framework.common.SpringUtils; -import com.zy.asrs.wms.asrs.entity.LocDetl; -import com.zy.asrs.wms.asrs.entity.OrderDetl; -import com.zy.asrs.wms.asrs.service.LocDetlService; -import com.zy.asrs.wms.asrs.service.OrderDetlService; -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class OrderOutBatchPreviewDto { - - private Long locId; - - private String locNo; - - private Long locDetlId; - - private Boolean all; - - private Double anfme; - - private Double stock; - - private Long orderDetlId; - - private Long operationPort; - - private List<BatchPreviewOtherLocDto> otherLoc; - - public LocDetl getLocDetl$() { - LocDetlService service = SpringUtils.getBean(LocDetlService.class); - LocDetl locDetl = service.getById(locDetlId); - if (!Cools.isEmpty(locDetl)){ - return locDetl; - } - return null; - } - - public OrderDetl getOrderDetl$() { - OrderDetlService service = SpringUtils.getBean(OrderDetlService.class); - OrderDetl orderDetl = service.getById(orderDetlId); - if (!Cools.isEmpty(orderDetl)){ - List<OrderDetl> orderDetls = new ArrayList<>(); - orderDetls.add(orderDetl); - List<OrderDetl> list = service.parseDetl(orderDetls); - return list.get(0); - } - return null; - } - -} +package com.zy.asrs.wms.asrs.entity.dto; + +import com.zy.asrs.framework.common.Cools; +import com.zy.asrs.framework.common.SpringUtils; +import com.zy.asrs.wms.asrs.entity.LocDetl; +import com.zy.asrs.wms.asrs.entity.OrderDetl; +import com.zy.asrs.wms.asrs.service.LocDetlService; +import com.zy.asrs.wms.asrs.service.OrderDetlService; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class OrderOutBatchPreviewDto { + + private Long locId; + + private String locNo; + + private Long locDetlId; + + private Boolean all; + + private Double anfme; + + private Double stock; + + private Long orderDetlId; + + private Long operationPort; + + private List<BatchPreviewOtherLocDto> otherLoc; + + public LocDetl getLocDetl$() { + LocDetlService service = SpringUtils.getBean(LocDetlService.class); + LocDetl locDetl = service.getById(locDetlId); + if (!Cools.isEmpty(locDetl)){ + return locDetl; + } + return null; + } + + public OrderDetl getOrderDetl$() { + OrderDetlService service = SpringUtils.getBean(OrderDetlService.class); + OrderDetl orderDetl = service.getById(orderDetlId); + if (!Cools.isEmpty(orderDetl)){ + List<OrderDetl> orderDetls = new ArrayList<>(); + orderDetls.add(orderDetl); + List<OrderDetl> list = service.parseDetl(orderDetls); + return list.get(0); + } + return null; + } + +} -- Gitblit v1.9.1