2024-10-19

1.生产驾驶舱接口调整

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC007.java

@@ -307,6 +307,7 @@ public class ServiceHGSC007 extends ServiceEPBase {
 			if (queryRow.containsKey("depositDate")) {
 				queryRow.put("depositDate", DateUtils.formatShort(queryRow.get("depositDate")));
 			}
+			queryRow.put("processNames",Arrays.asList("组立","油漆","埋弧盖面","抛丸除锈","拼装","焊接"));
 			List<Map> result = DaoBase.getInstance().query("HGSC007.queryBySunWt", queryRow);
 			inInfo.set(EiConstant.resultBlock, result);
 		} catch (PlatException e) {

src/main/java/com/baosight/hggp/hg/sc/sql/HGSC007.xml

@@ -1098,10 +1098,13 @@
 			</isNotEmpty>
 			group by h2.process_code
 		) B on A.process_code = B.process_code
-		where A.process_name in ('组立','油漆','埋弧盖面','抛丸除锈','拼装','焊接')
+		where 1=1
 			<isNotEmpty prepend=" AND " property="accountCode">
 				A.account_code = #accountCode#
 			</isNotEmpty>
+			<isNotEmpty prepend=" AND " property="processNames">
+				A.process_name IN <iterate close=")" open="(" conjunction="," property="processNames">#processNames[]#</iterate>
+			</isNotEmpty>
 			<isNotEmpty prepend=" AND " property="factoryName">
 				C.factory_name = #factoryName#
 			</isNotEmpty>