rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(common): 添加Base62工具类并优化多个功能模块 

- 新增Base62Util工具类，实现long类型数字到Base62字符串的编码功能
- 修改工装台账搜索对象继承关系，从PageQO改为SearchBaseQO
- 统一生产相关单据标题命名，将"生产订单退料单"改为"生产退料单"
- 修复盘点任务项负责人ID字段类型，从Integer改为Long以支持更大数值范围
- 在物料码搜索功能中新增状态过滤条件，支持按状态查询未开始、打包中、已完成的记录
- 修复物料控制器服务中缺少版本号设置的问题，在创建新物料时设置版本号为1
- 新增成本中心领料单模板，完善生产领料相关单据类型
- 优化生产领料单标题显示逻辑，根据数据类型区分生产领料单和成品发货领料单
- 修复包装删除对象验证注解，将@NotNull改为@NotEmpty以适配列表验证
- 调整二维码模板中采购单号列宽度，提升界面显示效果
- 优化结构化包装订单中的供应商信息处理，增加供应商编码和名称关联
- 实现二维码编码优化，使用Base62编码替换原有ID编码方式
- 修复数据库查询中日期范围参数映射错误，统一使用startDate和endDate参数名
- 在工具物料搜索中新增名称模糊查询功能，提升搜索便利性
- 修复操作记录中操作类型字段的格式化问题，确保数据一致性
This commit is contained in:
曹鹏飞 2026-03-26 18:02:43 +08:00
parent ddcb885f60
commit bdf413e1c0
25 changed files with 91 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InProduceBackController.java
View File

@ -407,7 +407,7 @@ public class InProduceBackController extends BaseController {
List<WmsInProduceBackItem> list = inProduceBackItemService.getList(id);
list.forEach(it -> it.setNum(null));
Map<String, String> base = new HashMap<>();
base.put("title", "生产订单退料单");
base.put("title", "生产退料单");
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
Map<String, Object> variables = new HashMap<>();
@ -428,7 +428,7 @@ public class InProduceBackController extends BaseController {
// order.setNo(order.getTicketNo());
List<InProduceBackTicketItemVO> list = inProduceBackTicketItemService.getList(id);
Map<String, String> base = new HashMap<>();
base.put("title", "生产订单退料单");
base.put("title", "生产退料单");
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
Map<String, Object> variables = new HashMap<>();

2
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutCostCenterController.java
View File

@ -580,6 +580,7 @@ public class OutCostCenterController extends BaseController {
Map<String, String> base = new HashMap<>();
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
base.put("title", "成本中心领料单");
Map<String, Object> variables = new HashMap<>();
variables.put("info", order);
variables.put("base", base);
@ -602,6 +603,7 @@ public class OutCostCenterController extends BaseController {
Map<String, String> base = new HashMap<>();
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
base.put("title", "成本中心领料出库单");
Map<String, Object> variables = new HashMap<>();
variables.put("info", order);
variables.put("base", base);

6
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/OutProduceController.java
View File

@ -717,7 +717,7 @@ public class OutProduceController extends BaseController {
// list.add(new WmsOutProduceItem().setMatnr(RandomUtil.randomNumbers(10)));
// }
Map<String, String> base = new HashMap<>();
base.put("title", order.getDataType() == 0 ? "生产订单领料单" : "成品发货领料单");
base.put("title", order.getDataType() == 0 ? "生产领料单" : "成品发货领料单");
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
Map<String, Object> variables = new HashMap<>();
@ -745,6 +745,7 @@ public class OutProduceController extends BaseController {
Map<String, String> base = new HashMap<>();
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
base.put("title", "生产补料单");
Map<String, Object> variables = new HashMap<>();
variables.put("info", order);
variables.put("base", base);
@ -767,6 +768,7 @@ public class OutProduceController extends BaseController {
Map<String, String> base = new HashMap<>();
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
base.put("qrcode", QRCodeUtil.generateQRCodeBase64(order.getNo(), 100, 100));
base.put("title", "生产补料出库单");
Map<String, Object> variables = new HashMap<>();
variables.put("info", order);
variables.put("base", base);
@ -787,7 +789,7 @@ public class OutProduceController extends BaseController {
List<OutProduceInfoItemVO> list = outProduceTicketItemService.getList(id);
list.forEach(it -> it.setAufnr(order.getAufnr()));
Map<String, String> base = new HashMap<>();
base.put("title", order.getDataType() == 0 ? "生产订单发料单" : "成品发货出库单");
base.put("title", order.getDataType() == 0 ? "生产领料出库单" : "成品发货出库单");
base.put("createDate", DateUtil.format(order.getCreateTime(), "yyyy-MM-dd"));
base.put("date", DateUtil.format(LocalDateTime.now(), "yyyy-MM-dd"));
Map<String, Object> variables = new HashMap<>();

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/QrCodeMasterController.java
View File

@ -69,7 +69,6 @@ public class QrCodeMasterController extends BaseController {
@PostMapping("search")
@ApiMark(moduleName = "获取二维码详细信息", apiName = "获取二维码详细信息")
public ApiResult<PageData<QrCodeItemVO>> search(@Valid @RequestBody QrCodeItemSearchQO request) {
return ApiResult.success(qrCodeMasterService.search(request));
}

24
nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java
View File

@ -161,7 +161,7 @@ public class StructuralPackageOrderController extends BaseController {
)
.toList();
if (Objects.equals(request.getType(), 2)
|| Objects.equals(request.getType(), 4) ) {
|| Objects.equals(request.getType(), 4)) {
datas.forEach(it -> {
it.setBatchNo(NoUtil.getBatchNo(it.getSupplierNo()));
});
@ -303,14 +303,18 @@ public class StructuralPackageOrderController extends BaseController {
List<WmsStructuralPackage> packages = structuralPackageService.lambdaQuery()
.in(WmsStructuralPackage::getId, request.getItems().stream().map(PackageDeliverOrderSaveItemQO::getPackageId).toList())
.list();
List<UserSupplier> suppliers = userSupplierService.listByIds(ordersForAdd.stream().map(WmsStructuralPackageOrder::getSupplierId).collect(Collectors.toSet()));
qrCodeMasterService.saveBatch(
ordersForAdd.stream()
.filter(it -> Objects.isNull(it.getId()))
.map(it -> {
WmsStructuralPackage p = packages.stream()
.filter(pt -> pt.getId().equals(it.getPackageId()))
.findFirst()
.get();
UserSupplier supplier = suppliers.stream()
.filter(pt -> pt.getId().equals(it.getSupplierId()))
.findFirst()
.get();
return new WmsQrCodeMaster()
.setBarcodeCode(KeyUtil.next())
.setProcessStage(BarCodeProcessStage.Unpackaged.getState())
@ -324,6 +328,9 @@ public class StructuralPackageOrderController extends BaseController {
.setPoNumber(it.getExternalOrderNo())
.setPoLineNumber(it.getRowNo())
.setExtendId(it.getId())
.setSupplierId(it.getSupplierId())
.setSupplierCode(supplier.getSupplierCode())
.setSupplierName(supplier.getSupplierName())
.setCreateUserId(UserUtil.getUserId())
.setCreateUserName(UserUtil.getUserName())
.setCreateTime(LocalDateTime.now());
@ -504,17 +511,18 @@ public class StructuralPackageOrderController extends BaseController {
List<DeliverStructuralPackageOrderTrayItemVO> list = structuralPackageOrderTrayItemService.getListVOByTrayId(id);
List<DeliverStructuralPackageOrderTrayItemVO> datas = new ArrayList<>();
for (DeliverStructuralPackageOrderTrayItemVO it : list) {
String code = Base62Util.encode(it.getId());
for (int i = 0, count = it.getShipmentNum().intValue(); i < count; i++) {
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
vo.setQrCodeId(it.getId() + "-" + (i + 1));
vo.setQrCode(it.getId() + "-" + (i + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1");
vo.setQrCodeId(code + "-" + (i + 1));
vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_1");
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
datas.add(vo);
}
if (it.getShipmentNum().remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) > 0) {
DeliverStructuralPackageOrderTrayItemVO vo = BeanUtil.copy(it, DeliverStructuralPackageOrderTrayItemVO.class);
vo.setQrCodeId(it.getId() + "-" + (it.getShipmentNum().intValue() + 1));
vo.setQrCode(it.getId() + "-" + (it.getShipmentNum().intValue() + 1) + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
vo.setQrCodeId(code + "-" + (it.getShipmentNum().intValue() + 1));
vo.setQrCode(vo.getQrCodeId() + "^" + it.getMaterialNo() + "_" + it.getTrayNo() + "_" + it.getShipmentNum().remainder(BigDecimal.ONE));
vo.setQrCodeImage(QRCodeUtil.generateQRCodeBase64(vo.getQrCode(), 200, 200));
datas.add(vo);
}
@ -996,7 +1004,7 @@ public class StructuralPackageOrderController extends BaseController {
VUtil.trueThrowBusinessError(StrUtil.isBlank(dto.getWarehouseNo())).throwMessage("ZIM_004接口查询到仓库为空");
BigDecimal num = BigDecimal.valueOf(order.getNum());
OptRecordDTO optRecordDTO1 = new OptRecordDTO();
optRecordDTO1.setOperationType((short)1);
optRecordDTO1.setOperationType((short) 1);
optRecordDTO1.setOrderId(order.getOrderNo());
optRecordService.add(optRecordDTO1);
Pair<Pair<String, String>, Pair<String, String>> pair = sapService.zwm3a17(new ZWM3A17DTO()
@ -1023,7 +1031,7 @@ public class StructuralPackageOrderController extends BaseController {
);
if (StrUtil.equalsIgnoreCase(dto.getKzkri(), "X")) {
OptRecordDTO optRecordDTO = new OptRecordDTO();
optRecordDTO.setOperationType((short)1);
optRecordDTO.setOperationType((short) 1);
optRecordDTO.setOrderId(order.getOrderNo());
optRecordService.add(optRecordDTO);
sapService.zwm3a18(new ZWM3A18DTO()

1
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
View File

@ -83,6 +83,7 @@ public class MaterialControllerService {
VUtil.trueThrowBusinessError(Objects.nonNull(old) && !old.getComplete())
.throwMessage("该物料存在草稿版本");
WmsMaterial wmsMaterial = Convert.convert(WmsMaterial.class, request);
wmsMaterial.setVersion(1);
wmsMaterial.setCreateBy(UserUtil.getUserName());
wmsMaterial.setCreateTime(LocalDateTime.now());
materialService.add(wmsMaterial);

2
nflg-wms-admin/src/main/resources/template/qrcode/qitao.html
View File

@ -48,7 +48,7 @@
<td rowspan="4" style="text-align: center;">
<img class="qrcode" alt="" th:src="${info.qrCode}"/>
</td>
<td style="width: 13mm;">
<td style="width: 15mm;">
采购单号:
</td>
<td style="width: 23mm;" th:text="${info.externalOrderNo}">

2
nflg-wms-admin/src/main/resources/template/成本中心领料单.html
View File

@ -139,7 +139,7 @@
</div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title">部门领料单</div>
<div class="title" th:text="${base.title}">部门领料单</div>
</div>
</div>
<div class="table-desc">

2
nflg-wms-admin/src/main/resources/template/生产补料单.html
View File

@ -166,7 +166,7 @@
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title">补 料 单</div>
<div class="title" th:text="${base.title}">生产补料单</div>
</div>
</div>
<div class="table-desc">

2
nflg-wms-admin/src/main/resources/template/生产退料单.html
View File

@ -166,7 +166,7 @@
<div class="qrcode"><img th:src="${base.qrcode}" src="../img/qrcode.png"/></div>
<div>
<div class="company-name">福建南方路面机械股份有限公司</div>
<div class="title" th:text="${base.title}">生产订单退料单</div>
<div class="title" th:text="${base.title}">生产退料单</div>
</div>
</div>
<div class="table-desc">

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/GongZhuangTaiZhangSearchQO.java
View File

@ -3,7 +3,7 @@ package com.nflg.wms.common.pojo.qo;
import lombok.Data;
@Data
public class GongZhuangTaiZhangSearchQO extends PageQO {
public class GongZhuangTaiZhangSearchQO extends SearchBaseQO {
/**
* 工装编号

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/InventoryCheckTaskSaveItemQO.java
View File

@ -25,5 +25,5 @@ public class InventoryCheckTaskSaveItemQO {
* 盘点负责人id
*/
@NotNull
private Integer chargeUserId;
private Long chargeUserId;
}

7
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/MaterialCodeSearchQO.java
View File

@ -2,8 +2,6 @@ package com.nflg.wms.common.pojo.qo;
import lombok.Data;
import java.time.LocalDate;
@Data
public class MaterialCodeSearchQO extends SearchBaseQO {
@ -36,4 +34,9 @@ public class MaterialCodeSearchQO extends SearchBaseQO {
* 下单结束日期
*/
private String orderEndDate;
/**
* 状态，0：未开始；1：打包中；2：已完成
*/
private Integer status;
}

3
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/PackingDelQO.java
View File

@ -1,5 +1,6 @@
package com.nflg.wms.common.pojo.qo;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
import lombok.experimental.Accessors;
@ -12,6 +13,6 @@ public class PackingDelQO {
/**
* 包装箱id
*/
@NotNull
@NotEmpty
private List<Long> id;
}

7
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ToolMaterialSearchQO.java
View File

@ -3,10 +3,15 @@ package com.nflg.wms.common.pojo.qo;
import lombok.Data;
@Data
public class ToolMaterialSearchQO extends PageQO{
public class ToolMaterialSearchQO extends SearchBaseQO{
/**
* 物料号
*/
private String no;
/**
* 工具名称
*/
private String name;
}

2
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemVO.java
View File

@ -67,7 +67,7 @@ public class InventoryCheckTaskItemVO {
/**
* 盘点负责人id
*/
private Integer chargeUserId;
private Long chargeUserId;
/**
* 所在地点

23
nflg-wms-common/src/main/java/com/nflg/wms/common/util/Base62Util.java Normal file
View File

@ -0,0 +1,23 @@
package com.nflg.wms.common.util;
public class Base62Util {
private static final String BASE62_CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
private static final int BASE = 62;
/**
* 将 long 类型数字编码为 Base62 字符串
*/
public static String encode(long num) {
if (num == 0) {
return String.valueOf(BASE62_CHARS.charAt(0));
}
StringBuilder sb = new StringBuilder();
while (num > 0) {
int remainder = (int) (num % BASE);
sb.append(BASE62_CHARS.charAt(remainder));
num = num / BASE;
}
return sb.reverse().toString();
}
}

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsInventoryCheckTaskItem.java
View File

@ -47,5 +47,5 @@ public class WmsInventoryCheckTaskItem implements Serializable {
/**
* 盘点负责人id
*/
private Integer chargeUserId;
private Long chargeUserId;
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsGongzhuangTaizhangServiceImpl.java
View File

@ -21,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
/**
* <p>
@ -66,6 +67,8 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl<WmsGongzhuangT
@Override
public IPage<WmsGongzhuangTaizhang> search(GongZhuangTaiZhangSearchQO request) {
return lambdaQuery()
.ge(Objects.nonNull(request.getStartDate()),WmsGongzhuangTaizhang::getCreateTime, request.getStartDate())
.le(Objects.nonNull(request.getEndDate()),WmsGongzhuangTaizhang::getCreateTime, request.getEndDate())
.like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo())
.like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName())
.orderByDesc(WmsGongzhuangTaizhang::getId)
@ -75,6 +78,8 @@ public class WmsGongzhuangTaizhangServiceImpl extends ServiceImpl<WmsGongzhuangT
@Override
public List<WmsGongzhuangTaizhang> searchAll(GongZhuangTaiZhangSearchQO request) {
return lambdaQuery()
.ge(Objects.nonNull(request.getStartDate()),WmsGongzhuangTaizhang::getCreateTime, request.getStartDate())
.le(Objects.nonNull(request.getEndDate()),WmsGongzhuangTaizhang::getCreateTime, request.getEndDate())
.like(StrUtil.isNotBlank(request.getNo()), WmsGongzhuangTaizhang::getNo, request.getNo())
.like(StrUtil.isNotBlank(request.getName()), WmsGongzhuangTaizhang::getName, request.getName())
.list();

8
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsToolMaterialServiceImpl.java
View File

@ -10,6 +10,7 @@ import com.nflg.wms.common.pojo.qo.ToolMaterialAddQO;
import com.nflg.wms.common.pojo.qo.ToolMaterialSearchQO;
import com.nflg.wms.common.pojo.qo.ToolMaterialUpdateQO;
import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.repository.entity.WmsGongzhuangTaizhang;
import com.nflg.wms.repository.entity.WmsToolMaterial;
import com.nflg.wms.repository.entity.WmsToolMaterialCheck;
import com.nflg.wms.repository.entity.WmsToolMaterialMaintain;
@ -23,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@ -62,7 +64,10 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl<WmsToolMaterialMappe
@Override
public IPage<WmsToolMaterial> search(ToolMaterialSearchQO request) {
return lambdaQuery()
.ge(Objects.nonNull(request.getStartDate()), WmsToolMaterial::getCreateTime, request.getStartDate())
.le(Objects.nonNull(request.getEndDate()),WmsToolMaterial::getCreateTime, request.getEndDate())
.like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo())
.like(StrUtil.isNotBlank(request.getName()), WmsToolMaterial::getName, request.getName())
.orderByDesc(WmsToolMaterial::getId)
.page(new Page<>(request.getPage(), request.getPageSize()));
}
@ -85,7 +90,10 @@ public class WmsToolMaterialServiceImpl extends ServiceImpl<WmsToolMaterialMappe
@Override
public List<WmsToolMaterial> searchAll(ToolMaterialSearchQO request) {
return lambdaQuery()
.ge(Objects.nonNull(request.getStartDate()),WmsToolMaterial::getCreateTime, request.getStartDate())
.le(Objects.nonNull(request.getEndDate()),WmsToolMaterial::getCreateTime, request.getEndDate())
.like(StrUtil.isNotBlank(request.getNo()), WmsToolMaterial::getNo, request.getNo())
.like(StrUtil.isNotBlank(request.getName()), WmsToolMaterial::getName, request.getName())
.list();
}
}

4
nflg-wms-repository/src/main/resources/mapper/WmsPackageMapper.xml
View File

@ -40,10 +40,10 @@
and a.supplier_id = #{request.supplierId}
</if>
<if test="request.startDate !=null">
and a.create_time>= #{request.inStartDate}
and a.create_time>= #{request.startDate}
</if>
<if test="request.endDate !=null">
and a.create_time &lt;= #{request.inEndDate}
and a.create_time &lt;= #{request.endDate}
</if>
</where>
order by a.package_type asc, a.create_time desc

4
nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml
View File

@ -43,10 +43,10 @@
and a.material_code =#{ request.materialCode}
</if>
<if test="request.startDate !=null">
and a.create_time>= #{request.inStartDate}
and a.create_time>= #{request.startDate}
</if>
<if test="request.endDate !=null">
and a.create_time &lt;= #{request.inEndDate}
and a.create_time &lt;= #{request.endDate}
</if>
<!-- group by a.id, a.barcode_code, a.barcode_type, a.process_stage, a.material_code, a.material_description,-->
<!-- a.packaging_type, a.unit, a.batch_no, a.serial_no, a.supplier_code, d.supplier_name, a.po_number,-->

4
nflg-wms-repository/src/main/resources/mapper/WmsReturnRequestMapper.xml
View File

@ -64,10 +64,10 @@
and a.purchase_group =#{ request.purchaseGroup}
</if>
<if test="request.startDate !=null">
and a.approve_time>= #{request.inStartDate}
and a.approve_time>= #{request.startDate}
</if>
<if test="request.endDate !=null">
and a.approve_time &lt;= #{request.inEndDate}
and a.approve_time &lt;= #{request.endDate}
</if>
</select>

4
nflg-wms-repository/src/main/resources/mapper/WmsTransferOrdersMapper.xml
View File

@ -31,10 +31,10 @@
and a.storage_location = #{request.storageLocation}
</if>
<if test="request.startDate !=null">
and a.create_time>= #{request.inStartDate}
and a.create_time>= #{request.startDate}
</if>
<if test="request.endDate !=null">
and a.create_time &lt;= #{request.inEndDate}
and a.create_time &lt;= #{request.endDate}
</if>
</where>
order by a.create_time DESC

1
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/MaterialCodeController.java
View File

@ -153,6 +153,7 @@ public class MaterialCodeController extends BaseController {
public ApiResult<PageData<WmsShipmentMaterialCode>> search(@Valid @RequestBody MaterialCodeSearchQO request) {
return ApiResult.success(
materialCodeService.lambdaQuery()
.eq(Objects.nonNull(request.getStatus()),WmsShipmentMaterialCode::getStatus, request.getStatus())
.ge(Objects.nonNull(request.getOrderStartDate()), WmsShipmentMaterialCode::getOrderDate, request.getOrderStartDate())
.le(Objects.nonNull(request.getOrderEndDate()), WmsShipmentMaterialCode::getOrderDate, request.getOrderEndDate())
.ge(Objects.nonNull(request.getStartDate()), WmsShipmentMaterialCode::getCreateTime, request.getStartDate())