mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-12 21:02:08 +08:00
修改-根据多个排单号查询板材数据
This commit is contained in:
+2
@@ -26,6 +26,8 @@ public class PlateDetailsRespVO {
|
||||
@Schema(description = "柜体ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String bodyId;
|
||||
|
||||
@Schema(description = "板材ID", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private String plateId;
|
||||
|
||||
@Schema(description = "板编号", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
@ExcelProperty("板编号")
|
||||
|
||||
+1
-1
@@ -17,7 +17,7 @@ import lombok.*;
|
||||
@AllArgsConstructor
|
||||
public class OrderDO extends BaseDO {
|
||||
|
||||
@TableId()
|
||||
@TableId
|
||||
// 生产单号
|
||||
private Long id;
|
||||
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ public interface ProductionStatusMapper extends BaseMapperX<OrderDO> {
|
||||
default List<OrderDO> selectPackPage(PackPageReqVO pageReqVO,Long organId) {
|
||||
return selectList(new LambdaQueryWrapperX<OrderDO>()
|
||||
.eq(OrderDO::getOrganId,organId)
|
||||
.eqIfPresent(OrderDO::getId, pageReqVO.getOrderId())
|
||||
.likeIfPresent(OrderDO::getId, String.valueOf(pageReqVO.getOrderId()))
|
||||
.eqIfPresent(OrderDO::getCustomOrderNo, pageReqVO.getCustomOrderNo())
|
||||
.likeIfPresent(OrderDO::getCustomer, pageReqVO.getCustomer())
|
||||
.likeIfPresent(OrderDO::getAddress, pageReqVO.getAddress())
|
||||
|
||||
+3
-1
@@ -114,7 +114,8 @@
|
||||
<resultMap id="PlateDetailsMap" type="com.cf.imes.module.manage.controller.admin.pack.vo.PlateDetailsRespVO">
|
||||
<result property="roomName" column="roomName"/>
|
||||
<result property="cabinetName" column="bodyName"/>
|
||||
<result property="plateNo" column="plateId"/>
|
||||
<result property="plateId" column="plateId"/>
|
||||
<result property="plateNo" column="plateNo"/>
|
||||
<result property="plateName" column="plateName"/>
|
||||
<result property="material" column="plateMaterial"/>
|
||||
<result property="color" column="plateColor"/>
|
||||
@@ -137,6 +138,7 @@
|
||||
ob.room_name as roomName,
|
||||
ob.name as bodyName,
|
||||
op.id as plateId,
|
||||
op.plate_no as plateNo,
|
||||
op.name as plateName,
|
||||
ogs.material as plateMaterial,
|
||||
ogs.color as plateColor,
|
||||
|
||||
Reference in New Issue
Block a user