WMS/wms-admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

整箱导出优化

Browse Source
This commit is contained in:
zc
2026-05-07 16:02:16 +08:00
parent 3113ba2542
commit e932af0404
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/mapper/FullWorkOrderMapper.java
View File

@@ -10,6 +10,8 @@ import top.continew.starter.data.mp.base.BaseMapper;
import top.wms.admin.fullWorkOrder.model.entity.FullWorkOrderDO;
import top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp;
import java.util.List;
/**
* 整箱领取记录 Mapper
*
@@ -21,4 +23,6 @@ public interface FullWorkOrderMapper extends BaseMapper<FullWorkOrderDO> {
IPage<FullWorkOrderResp> selectFullWorkOrderPage(@Param("page") Page<Object> objectPage,
@Param(Constants.WRAPPER) QueryWrapper<FullWorkOrderDO> queryWrapper);
List<FullWorkOrderResp> selectFullWorkOrderExport(@Param(Constants.WRAPPER) QueryWrapper<FullWorkOrderDO> queryWrapper);
}

12
wms-module-system/src/main/java/top/wms/admin/fullWorkOrder/service/impl/FullWorkOrderServiceImpl.java
View File

@@ -71,8 +71,16 @@ public class FullWorkOrderServiceImpl extends BaseServiceImpl<FullWorkOrderMappe
@Override
public void export(FullWorkOrderQuery query, SortQuery sortQuery, HttpServletResponse response) {
List<FullWorkOrderResp> list = super.list(query, sortQuery, this.getDetailClass());
list.forEach(super::fill);
QueryWrapper<FullWorkOrderDO> queryWrapper = new QueryWrapper<>();
queryWrapper.like(StrUtil.isNotBlank(query.getMaterialCode()), "f.material_code", query.getMaterialCode());
queryWrapper.eq(StrUtil.isNotBlank(query.getOrderNo()), "f.order_no", query.getOrderNo());
queryWrapper.eq(StrUtil.isNotBlank(query.getBatch()), "f.batch", query.getBatch());
queryWrapper.eq(StrUtil.isNotBlank(query.getMaterialName()), "m.material_name", query.getMaterialName());
queryWrapper.between(CollUtil.isNotEmpty(query.getCreateTime()), "f.create_time", CollUtil.getFirst(query
.getCreateTime()), CollUtil.getLast(query.getCreateTime()));
List<FullWorkOrderResp> list = baseMapper.selectFullWorkOrderExport(queryWrapper);
ExcelUtils.export(list, "整箱领取导出记录", FullWorkOrderResp.class, response);
}

4
wms-module-system/src/main/resources/mapper/FullWorkOrderMapper.xml
View File

@@ -12,4 +12,8 @@
left join sys_user u on f.create_user = u.id
${ew.customSqlSegment}
</select>
<select id="selectFullWorkOrderExport" resultType="top.wms.admin.fullWorkOrder.model.resp.FullWorkOrderResp">
</select>
</mapper>

4
wms-webapi/src/main/java/top/wms/admin/controller/weighManage/ah/AHDZCConnect.java
View File

@@ -28,9 +28,9 @@ import java.util.regex.Pattern;
public class AHDZCConnect {
//老设备（只能跑jar包的）
// private static final String PORT_NAME = "COM12";
private static final String PORT_NAME = "COM12";
//新设备（环境齐全的）
private static final String PORT_NAME = "COM13";
// private static final String PORT_NAME = "COM13";
private static final int BAUD_RATE = 9600;
private static final int DATA_BITS = 8;
private static final int STOP_BITS = 1;