修改bug

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BBomMapper.xml

@@ -28,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias,meterial_id,remark,batch_no,key_flag,important_flag,
+        id,create_time,create_user,update_time,update_user,parts_no,parts_alias,bom_alias,meterial_id,remark,batch_no,key_flag,important_flag,group_no,trayName,
         audit_status, parent_id, name, no, status, model, brand, specification, module_id,materialBrandName,productModuleName, version,org_id
     </sql>
 
@@ -38,11 +38,12 @@
         select
         <include refid="Base_Column_List"/>
         from (select b.*,m.trade_mark materialBrandName,mi.name productModuleName
-            ,bi.version,z.org_id
+        ,bi.version,z.org_id,t.name trayName
         from imcs_b_bom b LEFT JOIN imcs_m_meterial m on b.meterial_id = m.id
-            LEFT JOIN imcs_b_bom_version_info bi on b.id = bi.bom_id and bi.use_status = 1
-            LEFT JOIN imcs_m_module_info mi on b.product_module_id = mi.id
-            LEFT JOIN imcs_z_zone z on z.id = b.zone_id
+        LEFT JOIN imcs_b_bom_version_info bi on b.id = bi.bom_id and bi.use_status = 1
+        LEFT JOIN imcs_m_module_info mi on b.product_module_id = mi.id
+        LEFT JOIN imcs_z_zone z on z.id = b.zone_id
+        LEFT JOIN imcs_t_tray t on t.id = b.tray_id
         where 1=1
         ) s ${ew.customSqlSegment}
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/operationManagementCenter/OrderController.java

@@ -108,6 +108,7 @@ public class OrderController extends SuperController<OrderService, Long, Order,
                     wrapper.isNull(Order::getAuditStatus);
                 }
         wrapper.eq(Order::getSource,order.getSource())
+                .like(Order::getOrderName,order.getOrderName())
                 .in(Order::getPlanStatus,planStatus)
                 .geHeader(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_st())?null:LocalDateTime.parse(order.getDeliveryTime_st()))
                 .leFooter(Order::getDeliveryTime, StrUtil.isEmpty(order.getDeliveryTime_ed())?null:LocalDateTime.parse(order.getDeliveryTime_ed()))

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BBom.java

@@ -170,6 +170,11 @@ public class BBom extends Entity<Long> {
     @Excel(name = "托盘id")
     private Long trayId;
 
+    @ApiModelProperty(value = "托盘名称")
+    @TableField(exist = false)
+    @Excel(name = "托盘名称")
+    private String trayName;
+
     /**
      * 同步标志
      */