@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.90 → 2.2.13-beta.92

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
@@ -43,7 +43,7 @@ import { jsonParseSecurity, findComponentUniqueKeyByType } from "../../../common
 import { NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE } from "../../constant";
 import { Context } from "../../context";
 import { orderBackKmAddress } from "./constants";
-import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo, onBlurSkxLogisticsCode, onBlurSkxReturnTHLogisticsCode } from "./onBlur";
+import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo, onBlurSkxLogisticsCode, onBlurSkxReturnTHLogisticsCode, onBlurReturnLogisticsCode } from "./onBlur";
 import { findAllDependencies } from "./component-dependency-finder";
 import { findValueDependencies } from "./value-mapping-finder";
 import { skxOrderBack } from "./skxOrderBack";
@@ -418,7 +418,7 @@ var FormRender = function FormRender(props, ref) {
               return prv;
             }, {});
             if (!workOrderId) {
-              _context2.next = 43;
+              _context2.next = 44;
               break;
             }
             // 先初始化端上内容
@@ -444,24 +444,25 @@ var FormRender = function FormRender(props, ref) {
               created: newRecord.created,
               processTime: newRecord.processTime
             }));
+            console.log('transData', get(transData, '0', {}));
             initialValues = get(transData, '0', {});
             newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
             orderBackReplace(transData, templateDetail);
             // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
             tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
             if (!newRecord.notAutoFillWithFirstSubmit) {
-              _context2.next = 33;
+              _context2.next = 34;
               break;
             }
             currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
             _currentNodeTid = record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(currentNodeTradeIdUniqueKey, "_tradeId")];
             if (!_currentNodeTid) {
-              _context2.next = 29;
+              _context2.next = 30;
               break;
             }
             queryLabels(_currentNodeTid, shopId);
             queryMemberLevels(_currentNodeTid, shopId);
-            _context2.next = 27;
+            _context2.next = 28;
             return orderBack({
               companyKey: companyKey,
               order_no: _currentNodeTid,
@@ -475,11 +476,11 @@ var FormRender = function FormRender(props, ref) {
               callKey: 1,
               setLoading: setLoading
             });
-          case 27:
-            _context2.next = 31;
+          case 28:
+            _context2.next = 32;
             break;
-          case 29:
-            _context2.next = 31;
+          case 30:
+            _context2.next = 32;
             return skxOrderBack({
               form: form,
               companyKey: companyKey,
@@ -487,17 +488,17 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
             });
-          case 31:
-            _context2.next = 41;
+          case 32:
+            _context2.next = 42;
             break;
-          case 33:
+          case 34:
             if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
-              _context2.next = 40;
+              _context2.next = 41;
               break;
             }
             queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
             queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
-            _context2.next = 38;
+            _context2.next = 39;
             return orderBack({
               companyKey: companyKey,
               order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
@@ -511,16 +512,16 @@ var FormRender = function FormRender(props, ref) {
               callKey: 1,
               setLoading: setLoading
             });
-          case 38:
-            _context2.next = 41;
+          case 39:
+            _context2.next = 42;
             break;
-          case 40:
+          case 41:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 41:
-            _context2.next = 66;
+          case 42:
+            _context2.next = 67;
             break;
-          case 43:
+          case 44:
             fillByShopId(shopId);
             initFormValues = null;
             if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -539,7 +540,7 @@ var FormRender = function FormRender(props, ref) {
 
             // console.log(orderNo, initFormValues);
             if (!initFormValues) {
-              _context2.next = 54;
+              _context2.next = 55;
               break;
             }
             form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -556,9 +557,9 @@ var FormRender = function FormRender(props, ref) {
               _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
             }
             fetchRemark(_shopId, _orderNo);
-            _context2.next = 66;
+            _context2.next = 67;
             break;
-          case 54:
+          case 55:
             _transData = calcWorkOrderList([{
               jsonMap: jsonMap
             }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -570,12 +571,12 @@ var FormRender = function FormRender(props, ref) {
             batchFillByMapping(_initialValues);
             //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
             if (!(orderNo && shopId)) {
-              _context2.next = 65;
+              _context2.next = 66;
               break;
             }
             queryLabels(orderNo, shopId);
             queryMemberLevels(orderNo, shopId);
-            _context2.next = 63;
+            _context2.next = 64;
             return orderBack({
               companyKey: companyKey,
               order_no: orderNo,
@@ -590,13 +591,13 @@ var FormRender = function FormRender(props, ref) {
               callKey: 2,
               setLoading: setLoading
             });
-          case 63:
-            _context2.next = 66;
+          case 64:
+            _context2.next = 67;
             break;
-          case 65:
+          case 66:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 66:
+          case 67:
             antFormEl = document.getElementsByClassName('ant-form');
             (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
             resetMappingHideComponents();
@@ -605,7 +606,7 @@ var FormRender = function FormRender(props, ref) {
               type: 'setaAutoSubmitFlag',
               payload: true
             });
-          case 70:
+          case 71:
           case "end":
             return _context2.stop();
         }
@@ -942,6 +943,13 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
+    if (workOrderComponentType === 'WDT_RETURN_BILL_NO') {
+      wdtReturnBillNoBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
     if (activeLogisticsComponents && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
       setLogisticsInfo({
         logisticsMappingConfig: activeLogisticsComponents,
@@ -972,11 +980,11 @@ var FormRender = function FormRender(props, ref) {
               setKmLoading: setKmLoading
             });
           case 3:
-            _context6.next = 41;
+            _context6.next = 48;
             break;
           case 5:
             if (!(type === 'expressLogisticsCode')) {
-              _context6.next = 13;
+              _context6.next = 15;
               break;
             }
             _context6.next = 8;
@@ -1005,56 +1013,81 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 11:
-            _context6.next = 41;
-            break;
+            _context6.next = 13;
+            return onBlurReturnLogisticsCode({
+              form: form,
+              value: value,
+              templateDetail: templateDetail,
+              componentOnBlur: componentOnBlur,
+              orderBackRule: 'outSid'
+            });
           case 13:
+            _context6.next = 48;
+            break;
+          case 15:
+            if (!(type === 'returnLogisticsCode')) {
+              _context6.next = 20;
+              break;
+            }
+            _context6.next = 18;
+            return onBlurReturnLogisticsCode({
+              form: form,
+              value: value,
+              templateDetail: templateDetail,
+              componentOnBlur: componentOnBlur,
+              orderBackRule: 'logisticsCode'
+            });
+          case 18:
+            _context6.next = 48;
+            break;
+          case 20:
             if (!(type === 'skxOutboundNoticeNo')) {
-              _context6.next = 19;
+              _context6.next = 26;
               break;
             }
             //[SKX]ON出库通知单号  返填
             console.log('skxOutboundNoticeNo', value);
-            _context6.next = 17;
+            _context6.next = 24;
             return onBlurSkxOutboundNoticeNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 17:
-            _context6.next = 41;
+          case 24:
+            _context6.next = 48;
             break;
-          case 19:
+          case 26:
             if (!(type === 'skxReturnBillNo')) {
-              _context6.next = 24;
+              _context6.next = 31;
               break;
             }
-            _context6.next = 22;
+            _context6.next = 29;
             return onBlurSkxReturnBillNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 22:
-            _context6.next = 41;
+          case 29:
+            _context6.next = 48;
             break;
-          case 24:
+          case 31:
             if (!(type === 'skxReturnTHLogisticsCode')) {
-              _context6.next = 29;
+              _context6.next = 36;
               break;
             }
-            _context6.next = 27;
+            _context6.next = 34;
             return onBlurSkxReturnTHLogisticsCode({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 27:
-            _context6.next = 41;
+          case 34:
+            _context6.next = 48;
             break;
-          case 29:
+          case 36:
             // 收集所有需要执行的异步操作
             promises = [];
             if (type === 'tradeId') {
@@ -1066,7 +1099,7 @@ var FormRender = function FormRender(props, ref) {
               promises.push(handleChangeTradeId(value));
             }
             if (value) {
-              _context6.next = 36;
+              _context6.next = 43;
               break;
             }
             setReplaceValue(function (prev) {
@@ -1077,18 +1110,18 @@ var FormRender = function FormRender(props, ref) {
             });
             replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
             return _context6.abrupt("return");
-          case 36:
+          case 43:
             promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
               promises.push(changeHandle(value));
             }
             // 等待所有异步操作完成
-            _context6.next = 40;
+            _context6.next = 47;
             return Promise.all(promises);
-          case 40:
+          case 47:
             return _context6.abrupt("return", Promise.resolve());
-          case 41:
+          case 48:
           case "end":
             return _context6.stop();
         }

package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts

@@ -5,7 +5,7 @@ export declare const onBlurErpAfterSaleTradeId: ({ form, value, templateDetail,
     templateDetail: any;
     setKmLoading: (loading: boolean) => void;
 }) => Promise<void>;
-export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack }: {
+export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
     form: FormInstance;
     value: string;
     templateDetail: any;
@@ -14,7 +14,14 @@ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail,
     onlyGetTid?: boolean | undefined;
     needTradeIdOrderBack?: boolean | undefined;
 }) => Promise<any>;
-export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail, componentOnBlur, onlyGetTid, needTradeIdOrderBack }: {
+export declare const onBlurReturnLogisticsCode: ({ form, value, templateDetail, componentOnBlur, orderBackRule, }: {
+    form: FormInstance;
+    value: string;
+    templateDetail: any;
+    componentOnBlur: (value: any, type: string) => Promise<void>;
+    orderBackRule: string;
+}) => Promise<void>;
+export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
     form: FormInstance;
     value: string;
     templateDetail: any;