@kmkf-fe-packages/kmkf-work-order-service-component 2.1.0 → 2.1.1

package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts

@@ -217,8 +217,6 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
         }[] | undefined;
     };
     flowEventData?: {
-        eventStatus: 0 | 1 | 2 | 4;
-        eventType: string;
         eventData?: {
             businessStatus?: {
                 businessKey: string;

package/dist/esm/common/utils/tools.js

@@ -320,16 +320,21 @@ export var orderBack = /*#__PURE__*/function () {
           bsInfo = bsOrders && bsOrderTransform({
             detail: bsOrders || {}
           });
-          wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
+          wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
+            allOrders: wlnOrders.orders
+          }));
           bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: bsE3Orders === null || bsE3Orders === void 0 ? void 0 : bsE3Orders.orderList
           }), form);
           wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || []
           }), form);
           kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
+            allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
             order_no: order_no,
             componentList: templateDetail.componentDtoList
           }), form);
@@ -337,13 +342,15 @@ export var orderBack = /*#__PURE__*/function () {
             kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
           }
           gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
+            allOrders: gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades,
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
           pushGyLog('gyInfo', gyInfo);
           jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: (jstOrders === null || jstOrders === void 0 ? void 0 : jstOrders.orderList) || []
           }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
@@ -363,7 +370,8 @@ export var orderBack = /*#__PURE__*/function () {
           }
           if ((bsE3Orders === null || bsE3Orders === void 0 ? void 0 : (_bsE3Orders$orderList = bsE3Orders.orderList) === null || _bsE3Orders$orderList === void 0 ? void 0 : _bsE3Orders$orderList.length) > 1) {
             bsE3Info.bsE3Goods = _objectSpread(_objectSpread({}, bsE3Info.bsE3Goods), {}, {
-              bsE3Goods: []
+              bsE3Goods: [],
+              orders: []
             });
             // bsInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
             // bsInfo.bsSendGood = [{ sendId: '', sendName: '' }];
@@ -1050,7 +1058,8 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7)
   var orderInfo = bsE3OrderTransform({
     orderList: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: (value === null || value === void 0 ? void 0 : value.orders) || []
   }, form);
   var values = bsE3OrderBackFormValues(orderInfo, {
     componentDtoList: bsE3GoodsComponent
@@ -1073,7 +1082,8 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
   var wlnGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
   var orderInfo = wlnOrderTransform({
     orders: value.selectedRows,
-    shopCode: wlnGoodsValue.shopCode
+    shopCode: wlnGoodsValue.shopCode,
+    allOrders: value === null || value === void 0 ? void 0 : value.orders
   });
   var values = wlnOrderBackFormValues(orderInfo, {
     componentDtoList: bsGoodsComponent
@@ -1100,7 +1110,8 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
   var orderInfo = kmOrderTransform({
     trades: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders
   }, form);
   var values = kmOrderBackFormValues(orderInfo, {
     componentDtoList: kmGoodsComponent
@@ -1132,7 +1143,8 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10)
     trades: value.selectedRows,
     shopCode: wdtGoodsValue.shopCode,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: (value === null || value === void 0 ? void 0 : value.orders) || []
   }, form);
   var values = wdtOrderBackFormValues(orderInfo, {
     componentDtoList: wdtGoodsComponent
@@ -1159,7 +1171,8 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
   var orderInfo = gyOrderTransform({
     trades: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders
   }, form);
   var values = gyOrderBackFormValues(orderInfo, {
     componentDtoList: gyGoodsComponent
@@ -1186,7 +1199,8 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12)
   var orderInfo = jstOrderTransform({
     orderList: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders || []
   }, form);
   var values = jstOrderBackFormValues(orderInfo, {
     componentDtoList: jstGoodsComponent

package/dist/esm/common/utils/transformWorkOrderData.js

@@ -834,12 +834,22 @@ var processErpTradeId = function processErpTradeId(getValue) {
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
   };
 };
-var processWlnGoods = function processWlnGoods(getValue) {
-  return function (nex, config) {
-    return _defineProperty({}, nex.uniqueKey, {
-      wlnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnGoods")), []),
-      shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
-    });
+var processWlnGoods = function processWlnGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        wlnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        orderNo: orderNo
+      });
+    };
   };
 };
 var processWdtReissueGoods = function processWdtReissueGoods(templateColumns) {
@@ -1143,7 +1153,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       REISSUE_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
-      WLN_GOODS: processWlnGoods,
+      WLN_GOODS: processWlnGoods(templateColumns),
       WDT_REISSUE_GOODS: processWdtReissueGoods(templateColumns),
       GY_REISSUE_GOODS: processGyReissueGoods(templateColumns),
       GY_RETURN_GOODS: processGyReturnGoods(templateColumns),

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/paymentWorkOrder/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -71,6 +76,7 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -84,6 +90,7 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -97,6 +104,7 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -110,6 +118,7 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/singleShopWorkOrder/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.1.0",
-    "@kmkf-fe-packages/kmkf-utils": "2.1.0",
-    "@kmkf-fe-packages/services-components": "2.1.0",
+    "@kmkf-fe-packages/basic-components": "2.1.1",
+    "@kmkf-fe-packages/kmkf-utils": "2.1.1",
+    "@kmkf-fe-packages/services-components": "2.1.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4319df5d851141706800d4add90ab6674a05e281",
+  "gitHead": "fbfab5e12781f7bfdc14afe31bdec00598f74202",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }