oa

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -697,7 +697,7 @@
                                                                 and powbp.batch_code = powb.batch_code
         where pow.workorder_code = #{workorderCode} and pow.del_flag = '0' and powb.del_flag = '0'
         <if test="palletNo != null">and powbp.pallet_num = #{palletNo}</if>
-        order by powbp.pallet_num
+        order by CAST(powbp.pallet_num AS INT)
     </select>
 
     <insert id="createPrepareDetails">

op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcCheckUnqualifiedServiceImpl.java

@@ -361,8 +361,9 @@ public class QcCheckUnqualifiedServiceImpl implements IQcCheckUnqualifiedService
 		mainObject.append(",\"SFXYZG\":"+"\""+task.getSfxyzg()+"\"");//*是否需要主管审核 1否  0是
 		if("0".equals(task.getSfxyzg())){
 			mainObject.append(",\"PGZG\":"+"\""+task.getPgzg()+"\"");//QC主管：SFXYZG字段为"是",则此项选择QC主管信息
-			mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管  660：朱继新
+		};
-		}
+		mainObject.append(",\"PGZR\":"+"\""+task.getPgzr()+"\"");//质量主管  660：朱继新
+
 		mainObject.append(",\"SFGYSWT\":"+"\""+task.getSfgyswt()+"\"");//*是否供应商问题 1非供应商问题 0是供应商问题
 
 		mainObject.append("}");