@gct-paas/word 0.1.74-beta.36 → 0.1.74-beta.37

package/dist/core/data/enrichers/operation-receive-qty-enricher.d.ts

@@ -14,6 +14,6 @@ type OperationReceiveQtyWidgetInstance = {
 };
 /** 从单个 widget 实例解析工序接收数量 enrich 目标 */
 export declare function tryCollectOperationReceiveQtyTarget(instance: OperationReceiveQtyWidgetInstance): OperationReceiveQtyWidgetTarget | null;
-/** 工序接收数量：params 取 containerId / routingOperationId，空值时拉取 qty_current_ */
+/** 工序接收数量：getOne query 取 container_id_ / routing_operation_id_，空值时拉取 qty_current_ */
 export declare function createOperationReceiveQtyEnricher(doc: Doc, targets: OperationReceiveQtyWidgetTarget[]): DataEnricherRegistration;
 export {};

package/dist/domain/device/device-query.d.ts

@@ -1,5 +1,10 @@
+import { SelectApiBinding } from '../table/types';
+/** 填报设备下拉 / 扫码查询 */
+export declare const DEVICE_SEARCH_API: SelectApiBinding;
+export declare const DEVICE_GROUP_QUERY_KEY = "device_group_id_";
 /**
- * 设备可选过滤：启用中 + 使用中 +（校准有效期未过 OR 无校准日期）。
+ * 设备可选过滤：使用中 +（校准有效期未过 OR 无校准日期）。
  * `__orExpKeys` 供 buildLikeQuery 把校准两条件做成 OR。
+ * 设备组不要放进 extraQuery。
  */
 export declare function buildDeviceBaseQuery(extraQuery?: Record<string, any>): Record<string, any>;

package/dist/index.es.js

@@ -1,4 +1,4 @@
-/*! @gct-paas/word v0.1.74-beta.36 */
+/*! @gct-paas/word v0.1.74-beta.37 */
 import { Fragment, Suspense, Teleport, Transition, TransitionGroup, cloneVNode, computed, createApp, createBlock, createCommentVNode, createElementBlock, createElementVNode, createSlots, createStaticVNode, createTextVNode, createVNode, defineAsyncComponent, defineComponent, effectScope, getCurrentInstance, getCurrentScope, guardReactiveProps, h, inject, isRef, isVNode, markRaw, mergeModels, mergeProps, nextTick, normalizeClass, normalizeProps, normalizeStyle, onBeforeMount, onBeforeUnmount, onMounted, onScopeDispose, onUnmounted, openBlock, provide, reactive, readonly, ref, render, renderList, renderSlot, resolveComponent, resolveDynamicComponent, shallowRef, toDisplayString, toHandlers, toRaw, toRef, toValue, unref, useAttrs, useCssVars, useModel, useSlots, vModelRadio, vModelText, vShow, watch, watchEffect, withCtx, withDirectives, withKeys, withModifiers } from "vue";
 import St, { PopperWrapper } from "floating-vue";
 import VueKonva from "vue-konva";
@@ -98697,25 +98697,31 @@ var init_columns = __esmMin((() => {
 //#endregion
 //#region src/domain/device/device-query.ts
 /**
-* 设备可选过滤：启用中 + 使用中 +（校准有效期未过 OR 无校准日期）。
+* 设备可选过滤：使用中 +（校准有效期未过 OR 无校准日期）。
 * `__orExpKeys` 供 buildLikeQuery 把校准两条件做成 OR。
+* 设备组不要放进 extraQuery。
 */
 function buildDeviceBaseQuery(extraQuery) {
 	const today = dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss");
-	const queryData = {
-		operating_state_: true,
+	const { "device_type_id_.eq": deviceTypeId, ...extra } = extraQuery ?? {};
+	return {
 		"state_.eq": DeviceStatus.IN_USE,
 		"next_calibration_date_.ge": today,
 		"next_calibration_date_.isNull": null,
-		...extraQuery,
+		...extra,
+		...deviceTypeId ? { "device_type_id_.eq": deviceTypeId } : {},
 		__orExpKeys: ["next_calibration_date_.ge", "next_calibration_date_.isNull"]
 	};
-	const deviceTypeId = queryData["device_type_id_.eq"];
-	if (deviceTypeId == null || deviceTypeId === "") delete queryData["device_type_id_.eq"];
-	return queryData;
 }
+var DEVICE_SEARCH_API, DEVICE_GROUP_QUERY_KEY;
 var init_device_query = __esmMin((() => {
 	init_enum();
+	DEVICE_SEARCH_API = {
+		modelCategory: "entity",
+		modelKey: "em_device",
+		bsKey: "biz_form_device_search"
+	};
+	DEVICE_GROUP_QUERY_KEY = "device_group_id_";
 }));
 //#endregion
 //#region src/runtime/renderer/dropdowns/components/tables/utils/quick-search.ts
@@ -98780,9 +98786,14 @@ function buildLikeQuery(searchFields, keyword, extraQuery = {}, options) {
 		exp
 	};
 }
-/** 设备下拉：按设计端配置搜索，并附加设备可选范围过滤。 */
-function buildDeviceQuickSearchQuery(quickSearchField, keyword, extraQuery) {
-	return buildLikeQuery(quickSearchField || [], keyword, buildDeviceBaseQuery(extraQuery));
+/** 设备下拉：条件与 ref 相同；deviceGroupId 只进 query，不进 exp。 */
+function buildDeviceQuickSearchQuery(quickSearchField, keyword, extraQuery, deviceGroupId) {
+	const { queryData, exp } = buildLikeQuery(quickSearchField || [], keyword, buildDeviceBaseQuery(extraQuery));
+	if (deviceGroupId) queryData[DEVICE_GROUP_QUERY_KEY] = deviceGroupId;
+	return {
+		queryData,
+		exp
+	};
 }
 /** 关联下拉：按设计端配置搜索。 */
 function buildRefQuickSearchQuery(searchField, keyword, extraQuery, options) {
@@ -98838,12 +98849,13 @@ function getSelectStrategy(fieldType) {
 	if (strategy) return strategy;
 	return selectStrategyMap[FIELD_TYPE.REF];
 }
-var LOT2SN_STRATEGY, REF_STRATEGY, selectStrategyMap;
+var LOT2SN_STRATEGY, REF_STRATEGY, REF_OPERATING_STATE_STRATEGY, selectStrategyMap;
 var init_selectStrategy = __esmMin((() => {
 	init_field_type();
 	init_columns();
 	init_quick_search();
 	init_enum();
+	init_device_query();
 	LOT2SN_STRATEGY = {
 		columnsKey: "lot-sn",
 		fetcher: "lot2sn",
@@ -98866,6 +98878,15 @@ var init_selectStrategy = __esmMin((() => {
 		},
 		transform: transformLotData
 	};
+	REF_OPERATING_STATE_STRATEGY = {
+		...REF_STRATEGY,
+		buildQuery({ keyword, searchField, extraParams }) {
+			return buildRefQuickSearchQuery(searchField, keyword, {
+				...extraParams,
+				operating_state_: true
+			});
+		}
+	};
 	selectStrategyMap = {
 		[FIELD_TYPE.MATERIAL_NO]: LOT2SN_STRATEGY,
 		[FIELD_TYPE.SCRAP_MATERIAL_NO]: LOT2SN_STRATEGY,
@@ -98880,20 +98901,21 @@ var init_selectStrategy = __esmMin((() => {
 		},
 		[FIELD_TYPE.DEVICE]: {
 			columnsKey: "device",
-			fetcher: "ref",
+			fetcher: "biz",
+			api: DEVICE_SEARCH_API,
 			buildQuery({ keyword, searchField, deviceTypeId, deviceGroupId }) {
-				return buildDeviceQuickSearchQuery(searchField, keyword, {
-					...deviceTypeId ? { "device_type_id_.eq": deviceTypeId } : {},
-					...deviceGroupId ? { "device_group_id_.eq": deviceGroupId } : {}
-				});
+				return buildDeviceQuickSearchQuery(searchField, keyword, deviceTypeId ? { "device_type_id_.eq": deviceTypeId } : void 0, deviceGroupId);
 			},
 			transform: transformLotData
 		},
 		[FIELD_TYPE.ROUTING_OPERATION]: {
 			columnsKey: "route-operation",
 			fetcher: "ref",
-			buildQuery({ keyword }) {
-				return buildLikeQuery(["name_", "code_"], keyword, { type_: "NODE_SPEC" });
+			buildQuery({ keyword, isMockReport }) {
+				return buildLikeQuery(["name_", "code_"], keyword, {
+					type_: "NODE_SPEC",
+					...isMockReport ? {} : { operating_state_: true }
+				});
 			},
 			transform: transformLotData
 		},
@@ -98902,7 +98924,7 @@ var init_selectStrategy = __esmMin((() => {
 			fetcher: "ref",
 			clearFieldId: "scrap_reason_1_",
 			buildQuery({ keyword }) {
-				return buildLikeQuery(["name_", "code_"], keyword, { operating_state_: true });
+				return buildLikeQuery(["name_", "code_"], keyword);
 			},
 			transform: transformLotData
 		},
@@ -98934,7 +98956,7 @@ var init_selectStrategy = __esmMin((() => {
 						isLinkQuery: true
 					};
 					if (keyword === null || keyword === void 0 ? void 0 : keyword.trim()) {
-						const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword, { operating_state_: true });
+						const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword);
 						return {
 							queryData: {
 								...queryData,
@@ -98948,7 +98970,7 @@ var init_selectStrategy = __esmMin((() => {
 						exp: ""
 					};
 				}
-				return buildLikeQuery(["name_", "code_"], keyword, { operating_state_: true });
+				return buildLikeQuery(["name_", "code_"], keyword);
 			},
 			transform: transformLotData
 		},
@@ -98957,7 +98979,7 @@ var init_selectStrategy = __esmMin((() => {
 			fetcher: "ref",
 			clearFieldId: "not_good_reason_1_",
 			buildQuery({ keyword }) {
-				return buildLikeQuery(["name_", "code_"], keyword, { operating_state_: true });
+				return buildLikeQuery(["name_", "code_"], keyword);
 			},
 			transform: transformLotData
 		},
@@ -98989,7 +99011,7 @@ var init_selectStrategy = __esmMin((() => {
 						isLinkQuery: true
 					};
 					if (keyword === null || keyword === void 0 ? void 0 : keyword.trim()) {
-						const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword, { operating_state_: true });
+						const { queryData: searchQuery, exp } = buildLikeQuery(["name_", "code_"], keyword);
 						return {
 							queryData: {
 								...queryData,
@@ -99003,7 +99025,7 @@ var init_selectStrategy = __esmMin((() => {
 						exp: ""
 					};
 				}
-				return buildLikeQuery(["name_", "code_"], keyword, { operating_state_: true });
+				return buildLikeQuery(["name_", "code_"], keyword);
 			},
 			transform: transformLotData
 		},
@@ -99012,14 +99034,8 @@ var init_selectStrategy = __esmMin((() => {
 			fetcher: "rdo2ref",
 			isTree: true,
 			buildQuery({ keyword, searchField, extraParams }) {
-				if (searchField === null || searchField === void 0 ? void 0 : searchField.length) return buildRefQuickSearchQuery(searchField, keyword, {
-					operating_state_: true,
-					...extraParams
-				});
-				return buildLikeQuery(["name_", "code_"], keyword, {
-					operating_state_: true,
-					...extraParams
-				});
+				if (searchField === null || searchField === void 0 ? void 0 : searchField.length) return buildRefQuickSearchQuery(searchField, keyword, extraParams);
+				return buildLikeQuery(["name_", "code_"], keyword, extraParams);
 			},
 			transform: transformTreeData
 		},
@@ -99028,10 +99044,7 @@ var init_selectStrategy = __esmMin((() => {
 			fetcher: "rdo2ref",
 			isTree: true,
 			buildQuery({ keyword, searchField, extraParams }) {
-				return buildLikeQuery((searchField === null || searchField === void 0 ? void 0 : searchField.length) ? searchField : ["name_", "code_"], keyword, {
-					operating_state_: true,
-					...extraParams
-				});
+				return buildLikeQuery((searchField === null || searchField === void 0 ? void 0 : searchField.length) ? searchField : ["name_", "code_"], keyword, extraParams);
 			},
 			transform: transformTreeData
 		},
@@ -99040,14 +99053,14 @@ var init_selectStrategy = __esmMin((() => {
 			fetcher: "rdo2ref",
 			isTree: true,
 			buildQuery({ keyword, searchField }) {
-				return buildLikeQuery((searchField === null || searchField === void 0 ? void 0 : searchField.length) ? searchField : ["name_", "code_"], keyword, { operating_state_: true });
+				return buildLikeQuery((searchField === null || searchField === void 0 ? void 0 : searchField.length) ? searchField : ["name_", "code_"], keyword);
 			},
 			transform: transformTreeData
 		},
-		[FIELD_TYPE.WAREHOUSE]: REF_STRATEGY,
-		[FIELD_TYPE.TARGET_WAREHOUSE]: REF_STRATEGY,
-		[FIELD_TYPE.LOCATION]: REF_STRATEGY,
-		[FIELD_TYPE.SHOPFLOOR]: REF_STRATEGY,
+		[FIELD_TYPE.WAREHOUSE]: REF_OPERATING_STATE_STRATEGY,
+		[FIELD_TYPE.TARGET_WAREHOUSE]: REF_OPERATING_STATE_STRATEGY,
+		[FIELD_TYPE.LOCATION]: REF_OPERATING_STATE_STRATEGY,
+		[FIELD_TYPE.SHOPFLOOR]: REF_OPERATING_STATE_STRATEGY,
 		[FIELD_TYPE.REF]: REF_STRATEGY,
 		[FIELD_TYPE.MODEL_RELATION]: REF_STRATEGY,
 		[FIELD_TYPE.PRODUCTION_CONTAINER]: {
@@ -100208,18 +100221,21 @@ var init_of_inst_num_enricher = __esmMin((() => {
 }));
 //#endregion
 //#region src/core/data/enrichers/operation-receive-qty-enricher.ts
-function resolveQueryParams(doc) {
+/** 上下文 → getOne query；缺任一条件则不请求 */
+function resolveQtyCurrentQuery(doc) {
 	const containerId = readContextParam(doc, "containerId");
 	const routingOperationId = readContextParam(doc, "routingOperationId");
+	if (isBlank$1(containerId) || isBlank$1(routingOperationId)) return void 0;
 	return {
-		containerId: isBlank$1(containerId) ? void 0 : String(containerId),
-		routingOperationId: isBlank$1(routingOperationId) ? void 0 : String(routingOperationId)
+		container_id_: String(containerId),
+		routing_operation_id_: String(routingOperationId)
 	};
 }
 function parseQtyCurrent(res) {
-	const payload = unwrapBizServiceData(res) ?? res;
-	if (!payload || typeof payload !== "object") return void 0;
-	const raw = (payload.data && typeof payload.data === "object" ? payload.data : payload).qty_current_;
+	const payload = unwrapBizServiceData(res);
+	const row = (payload === null || payload === void 0 ? void 0 : payload.data) && typeof payload.data === "object" ? payload.data : payload;
+	if (!row) return void 0;
+	const raw = row.qty_current_;
 	if (raw === void 0 || raw === null || raw === "") return void 0;
 	const num = Number(raw);
 	return Number.isNaN(num) ? void 0 : num;
@@ -100237,12 +100253,9 @@ async function fetchQtyCurrent(doc) {
 	const existing = inflightQtyByDoc.get(doc);
 	if (existing) return existing;
 	const task = (async () => {
-		const { containerId, routingOperationId } = resolveQueryParams(doc);
-		if (!containerId || !routingOperationId) return void 0;
-		return parseQtyCurrent(await callBizService(OPERATION_RECEIVE_QTY_API, {
-			containerId,
-			routingOperationId
-		}));
+		const query = resolveQtyCurrentQuery(doc);
+		if (!query) return void 0;
+		return parseQtyCurrent(await callBizService(OPERATION_RECEIVE_QTY_API, { query }));
 	})();
 	inflightQtyByDoc.set(doc, task);
 	try {
@@ -100263,7 +100276,7 @@ function tryCollectOperationReceiveQtyTarget(instance) {
 	if (!field || field.fieldType !== FIELD_TYPE.OPERATION_RECEIVE_QTY || !instance.valuePath) return null;
 	return { valuePath: String(instance.valuePath) };
 }
-/** 工序接收数量：params 取 containerId / routingOperationId，空值时拉取 qty_current_ */
+/** 工序接收数量：getOne query 取 container_id_ / routing_operation_id_，空值时拉取 qty_current_ */
 function createOperationReceiveQtyEnricher(doc, targets) {
 	const pathMatchers = targets.map((item) => createValuePathMatcher(item.valuePath));
 	return {
@@ -137240,16 +137253,11 @@ async function submitDeviceScan(params) {
 		ok: false,
 		message: MSG_NO_CODE
 	};
-	const { queryData, exp } = buildLikeQuery([], "", buildDeviceBaseQuery({
-		"code_.eq": code,
-		...deviceGroupId ? { "device_group_id_.eq": deviceGroupId } : {}
-	}));
-	const option = (_res$options = (await apiFetchers.ref.getOptions({
-		fieldKey: fieldInfo.key,
-		modelKey: fieldInfo.modelKey,
-		refModelKey: fieldInfo.bindInfo,
-		exp,
+	const { queryData, exp } = buildDeviceQuickSearchQuery([], "", { "code_.eq": code }, deviceGroupId);
+	const option = (_res$options = (await apiFetchers.biz.getOptions({
+		api: DEVICE_SEARCH_API,
 		queryData,
+		exp,
 		pageNo: 1,
 		pageSize: 30
 	})).options) === null || _res$options === void 0 ? void 0 : _res$options[0];
@@ -139434,7 +139442,8 @@ function useTableDropdown(props, searchFilters) {
 			deviceTypeId: deviceTypeId ?? (filters === null || filters === void 0 ? void 0 : filters.deviceTypeId),
 			deviceGroupId: widgetProps.value.enableCascadeDataFilter ? widgetProps.value.deviceGroupId : void 0,
 			extraParams,
-			optionMapping
+			optionMapping,
+			isMockReport: !!docInst.value.isMockReport
 		})) ?? {};
 		const apiFetcher = apiFetchers[fetcher];
 		if (!apiFetcher) return {
@@ -165225,7 +165234,7 @@ async function fetchProductOptions() {
 		modelCategory: ENTITY_CATEGORY$1
 	}, {}, {
 		exp: "",
-		query: { operating_state_: true },
+		query: {},
 		pageNo: 1,
 		pageSize: 9999
 	});
@@ -165244,7 +165253,7 @@ async function fetchUomConvertRuleOptions() {
 		modelKey: UOM_CONVERT_RULE_MODEL_KEY,
 		modelCategory: ENTITY_CATEGORY$1
 	}, {}, {
-		query: { operating_state_: true },
+		query: {},
 		pageNo: 1,
 		pageSize: 999
 	});
@@ -169781,7 +169790,7 @@ var field_e_sop_version_config_vue_vue_type_script_setup_true_lang_default = /*@
 				modelCategory: "entity"
 			}, {}, {
 				exp: "",
-				query: { operating_state_: true },
+				query: {},
 				pageNo: 1,
 				pageSize: 9999
 			});
@@ -169873,7 +169882,7 @@ var field_e_sop_version_config_vue_vue_type_script_setup_true_lang_default = /*@
 //#region src/suites/edhr/panel-config/field/e-sop-version/field-e-sop-version-config.vue
 var field_e_sop_version_config_exports = /* @__PURE__ */ __exportAll({ default: () => field_e_sop_version_config_default });
 init__plugin_vue_export_helper();
-var field_e_sop_version_config_default = /*#__PURE__*/ _plugin_vue_export_helper_default(field_e_sop_version_config_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-792e485e"]]);
+var field_e_sop_version_config_default = /*#__PURE__*/ _plugin_vue_export_helper_default(field_e_sop_version_config_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-378f7219"]]);
 //#endregion
 //#region src/suites/shared/panel/config/editor/enum-opt-editor/enum-option-item.vue?vue&type=script&setup=true&lang.ts
 init_base$2();

package/dist/runtime/renderer/dropdowns/components/tables/strategy/selectStrategy.d.ts

@@ -18,6 +18,8 @@ export interface SelectQueryContext {
         value?: string;
         label?: string;
     };
+    /** 模拟填报：工序不传 operating_state_，避免模板数据被启用态滤空 */
+    isMockReport?: boolean;
 }
 export interface SelectQueryResult {
     queryData?: Record<string, any>;

package/dist/runtime/renderer/dropdowns/components/tables/utils/quick-search.d.ts

@@ -18,8 +18,8 @@ export declare function buildLikeQuery(searchFields: string[], keyword: string,
     queryData: Record<string, any>;
     exp: string;
 };
-/** 设备下拉：按设计端配置搜索，并附加设备可选范围过滤。 */
-export declare function buildDeviceQuickSearchQuery(quickSearchField: string[] | undefined, keyword: string, extraQuery?: Record<string, any>): {
+/** 设备下拉：条件与 ref 相同；deviceGroupId 只进 query，不进 exp。 */
+export declare function buildDeviceQuickSearchQuery(quickSearchField: string[] | undefined, keyword: string, extraQuery?: Record<string, any>, deviceGroupId?: string): {
     queryData: Record<string, any>;
     exp: string;
 };

package/dist/word.css

@@ -13618,7 +13618,7 @@ svg.portrait-icon[data-v-8bdb451e] {
 .panel-field-datetime-config[data-v-c9d1de47] {
   padding: 16px;
 }
-.panel-field-e-sop-version-config[data-v-792e485e] {
+.panel-field-e-sop-version-config[data-v-378f7219] {
   padding: 16px;
 }
 .enum-option-item[data-v-b9876231] {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/word",
-  "version": "0.1.74-beta.36",
+  "version": "0.1.74-beta.37",
   "description": "GCT 在线 word",
   "keywords": [
     "vue",