1.不合格品管理查询语句修改

2.三坐标测量不合格查询下料逻辑代码修改

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/util/MsgUtil.java

@@ -188,7 +188,7 @@ public class MsgUtil implements ApplicationContextAware {
                 Random random = new Random();
                 Boolean measuringFlag = random.nextBoolean();
 //                int measuringResult = measuringFlag ? 0 : 1;
-                int measuringResult = 0;
+                int measuringResult = 1;
                 String measuringResultFile = filePath + taskNode.getCompleteBatchNo() + "_" + task.getProcedureNo();
                 List<String> fileContents = new ArrayList<>();
                 OrderQuality orderQuality = new OrderQuality();
@@ -245,7 +245,7 @@ public class MsgUtil implements ApplicationContextAware {
                     List<BomProcedure> bomProcedureList = bomProcedureService.list(Wraps.<BomProcedure>lbQ().eq(BomProcedure::getBomId,task.getBomId()).eq(BomProcedure::getType,"下料").orderByAsc(BomProcedure::getSort));
                     if(CollectionUtil.isNotEmpty(bomProcedureList)){
                         //获取下料序的第一个节点
-                        List<TaskNode> taskNodes = taskNodeService.list(Wraps.<TaskNode>lbQ().eq(TaskNode::getProcedureId,bomProcedureList.get(0).getId()).orderByAsc(TaskNode::getCompleteBatchSort));
+                        List<TaskNode> taskNodes = taskNodeService.list(Wraps.<TaskNode>lbQ().eq(TaskNode::getProcedureId,bomProcedureList.get(0).getId()).eq(TaskNode::getCompleteBatchNo,task.getCompleteBatchNo()).orderByAsc(TaskNode::getCompleteBatchSort));
                         if(CollectionUtil.isNotEmpty(taskNodes)){
                             jsonObject.put("taskNodeId",taskNodes.get(0).getId());
                             //强制下线

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

@@ -35,7 +35,7 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_user,create_time,update_time,update_user,bom_num,no,
-        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,addOrderName
+        task_id, task_no, order_id, order_no,order_name, plan_id, plan_no, procedure_id, bom_id, bom_name, create_user_name, handle_time, handle_user, handle_user_name, test_result, add_order_id, add_order_no,handle_way, handle_status, unique_code,procedureNo,procedureName,orderName,addOrderName
     </sql>
 
     <!-- 分页 -->
@@ -46,11 +46,13 @@
         SELECT
         a.*, p. NO procedureNo,
         p. NAME procedureName,
-        o.order_name addOrderName
+        o.order_name orderName,
+        o1.order_name addOrderName
         FROM
         imcs_t_task_test_unqualified_bom a
         LEFT JOIN imcs_b_bom_procedure p ON a.procedure_id = p.id
-        LEFT JOIN imcs_o_order o ON a.add_order_id = o.id
+        LEFT JOIN imcs_o_order o ON a.order_id = o.id
+        LEFT JOIN imcs_o_order o1 ON a.add_order_id = o1.id
         ) s ${ew.customSqlSegment}
     </select>