Merge remote-tracking branch 'origin/master' into master

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/OrderProductMapper.xml

@@ -19,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,orderName,
+        id,create_time,update_time,bomName,bomNo, order_no,unqualifiedCount,addOrderCount,completeNum,qualifiedCount,
         order_id, bom_id, bom_num, orderDeliveryTime, remark, create_user, update_user, produce_status
     </sql>
 

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

@@ -74,7 +74,7 @@ public class MeasuringController extends SuperController<OrderQualityService, Lo
         OrderQuality orderQuality = BeanUtil.toBean(data, OrderQuality.class);
 
         wrapper.like(OrderQuality::getWorkpieceName,orderQuality.getWorkpieceName())
-                .like(OrderQuality::getOrderNo,orderQuality.getOrderNo())
+                .like(OrderQuality::getOrderName,orderQuality.getOrderName())
                 .like(OrderQuality::getWorkpieceId,orderQuality.getWorkpieceId())
                 .like(OrderQuality::getCreateTime,data.getCreateTime());
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/operationManagementCenter/entity/OrderQuality.java

@@ -70,7 +70,7 @@ public class OrderQuality extends Entity {
     /**
      * 工件ID
      */
-    @ApiModelProperty(value = "工件ID)")
+    @ApiModelProperty(value = "工件ID")
     @TableField(value = "workpiece_id", condition = LIKE)
     @Excel(name = "工件ID)")
     private String workpieceId;
@@ -78,7 +78,7 @@ public class OrderQuality extends Entity {
     /**
      * 工件名称
      */
-    @ApiModelProperty(value = "工件名称)")
+    @ApiModelProperty(value = "工件名称")
     @TableField(value = "workpiece_name", condition = LIKE)
     @Excel(name = "工件名称)")
     private String workpieceName;
@@ -86,7 +86,7 @@ public class OrderQuality extends Entity {
     /**
      * 工序ID
      */
-    @ApiModelProperty(value = "工序id)")
+    @ApiModelProperty(value = "工序id")
     @TableField(value = "procedure_id")
     @Excel(name = "工序id)")
     private Long procedureId;
@@ -94,7 +94,7 @@ public class OrderQuality extends Entity {
     /**
      * 工序名称
      */
-    @ApiModelProperty(value = "工序名称)")
+    @ApiModelProperty(value = "工序名称")
     @TableField(value = "procedure_name")
     @Excel(name = "工序名称)")
     private String procedureName;
@@ -102,7 +102,7 @@ public class OrderQuality extends Entity {
     /**
      * 测量类型
      */
-    @ApiModelProperty(value = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
+    @ApiModelProperty(value = "测量类型 1:质量检测 2工件坐标系检测 3人工测量")
     @TableField(value = "measuring_type")
     @Excel(name = "测量类型 1:质量检测 2工件坐标系检测 3人工测量)")
     private int measuringType;