@kmkf-fe-packages/kmkf-work-order-service-component 0.29.1 → 0.29.2-rc.2

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

@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } fro
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
@@ -432,8 +432,41 @@ var FormRender = function FormRender(props, ref) {
     (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
     resetMappdingHideComponents();
   };
+  var repeatWarningDataSchema = function repeatWarningDataSchema(formValue, templateDetail) {
+    var getKeyByValue = function getKeyByValue(value) {
+      return Object.keys(COMPONENT_MAP).find(function (key) {
+        return COMPONENT_MAP[key] === value;
+      });
+    };
+    var needRepeatWarnComponent = Object.values(COMPONENT_MAP);
+    templateDetail.componentDtoList.reduce(function (cur, nxt) {
+      if (needRepeatWarnComponent !== null && needRepeatWarnComponent !== void 0 && needRepeatWarnComponent.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+        var instance = factory(nxt.workOrderComponentType, {
+          id: nxt.uniqueKey,
+          name: nxt.name,
+          componentConfig: nxt.componentConfig,
+          effects: {},
+          type: nxt.workOrderComponentType
+        });
+        var _id = instance === null || instance === void 0 ? void 0 : instance.id;
+        var value = formValue[_id];
+        var _key = getKeyByValue(nxt.workOrderComponentType);
+        if (_key) {
+          cur[_key] = value;
+        }
+        return cur;
+      }
+    }, {});
+  };
   useEffect(function () {
-    if (isErpUse) return;
+    if (isErpUse && templateDetail) {
+      var formValue = form.getFieldsValue(true);
+      console.debug('表单内容值', formValue);
+      // TODO: 拼装需要重复提醒的组件数据格式
+      var value = repeatWarningDataSchema(formValue, templateDetail);
+      console.debug('重复提醒转换之后数据', value);
+      return orderBackReplace(value, templateDetail);
+    }
     queryDetail({
       workOrderId: workOrderId,
       shopId: shopId,
@@ -443,7 +476,7 @@ var FormRender = function FormRender(props, ref) {
       buyerId: buyerId,
       buyerNick: buyerNick
     });
-  }, [workOrderId, record, shopId, isErpUse]);
+  }, [workOrderId, record, shopId, isErpUse, templateDetail]);
 
   // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
   var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -474,8 +507,8 @@ var FormRender = function FormRender(props, ref) {
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
-    for (var _key in values) {
-      fillByMapping(_key, values[_key]);
+    for (var _key2 in values) {
+      fillByMapping(_key2, values[_key2]);
     }
   };
   // 组件映射
@@ -488,8 +521,8 @@ var FormRender = function FormRender(props, ref) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key2 in mapping) {
-        for (var uniqueKey in mapping[_key2]) {
+      for (var _key3 in mapping) {
+        for (var uniqueKey in mapping[_key3]) {
           resetSet.add(uniqueKey);
         }
       }

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

@@ -286,7 +286,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       if (interceptCompany && !ExpressData.getInstance().getExpressNameByCode(interceptCompany, false)) {
         needTransForm = true;
       }
-      var interceptValuesMap = ['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot'];
+      var interceptValuesMap = ['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus'];
       interceptValuesMap.forEach(function (t) {
         contentVoList.push({
           uniqueKey: "".concat(item.uniqueKey, "_").concat(t),
@@ -936,7 +936,8 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         WDT_REISSUE_GOODS: {
           type: 'wdtReissueType',
           goods: 'wdtReissueGoods',
-          shopCode: 'shopCode'
+          shopCode: 'shopCode',
+          systemOrderNo: 'wdtSystemOrderNo'
         }
       };
       var reissue = get(nowData, "".concat(item.uniqueKey), {});
@@ -955,6 +956,13 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '',
         name: item.name
       });
+      if (item.workOrderComponentType === 'WDT_REISSUE_GOODS') {
+        contentVoList.push({
+          uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].systemOrderNo),
+          content: (reissue === null || reissue === void 0 ? void 0 : reissue[reissueMap[item.workOrderComponentType].systemOrderNo]) || '',
+          name: item.name
+        });
+      }
     } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
       var bsReturn = get(nowData, "".concat(item.uniqueKey), {});
       contentVoList.push({
@@ -1295,7 +1303,8 @@ var transDataSource = function transDataSource(templateColumns) {
           interceptReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_interceptReceiverMobile")],
           interceptLogisticsStatus: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatus")],
           interceptLogisticsStatusOther: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatusOther")],
-          interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")]
+          interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")],
+          qySelfInterceptLogisticsStatus: item.jsonMap["".concat(nex.uniqueKey, "_qySelfInterceptLogisticsStatus")]
         }));
       } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [{}])));
@@ -1598,7 +1607,8 @@ var transDataSource = function transDataSource(templateColumns) {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           wdtReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueType")], []),
           wdtReissueGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueGoods")], []),
-          shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
+          shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")],
+          wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
         }));
       }
     }, {});
@@ -1621,7 +1631,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread55, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread55, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1766,15 +1776,20 @@ export var orderBack = /*#__PURE__*/function () {
               sendName: ''
             }];
           }
-          // if (wdtOrders?.orders?.length > 1) {
-          //   wdtInfo.bsGoods = {
-          //     ...wdtInfo.bsGoods,
-          //     bsGoods: [],
-          //   };
-          //   wdtInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
-          //   wdtInfo.bsSendGood = [{ sendId: '', sendName: '' }];
-          //   wdtInfo.bsDeliveryNo = [{ deliveryNo: '' }];
-          // }
+          if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$orders = wdtOrders.orders) === null || _wdtOrders$orders === void 0 ? void 0 : _wdtOrders$orders.length) > 1) {
+            wdtInfo.wdtGoods = _objectSpread(_objectSpread({}, wdtInfo.wdtGoods), {}, {
+              wdtGoods: []
+            });
+            wdtInfo.wdtLogistics = [{
+              logisticsCompany: null,
+              logisticsCode: ''
+            }];
+            wdtInfo.wdtSendGood = [{
+              sendId: '',
+              sendName: ''
+            }];
+            // wdtInfo.wdtDeliveryNo = [{ deliveryNo: '' }];
+          }
 
           //获取当前表单字段
           formValue = form.getFieldsValue();
@@ -1793,7 +1808,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 55;
+            _context.next = 56;
             break;
           }
           list = detail['itemList'];
@@ -1811,10 +1826,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 45;
-          _context.next = 48;
+          _context.prev = 46;
+          _context.next = 49;
           return Promise.all(promises);
-        case 48:
+        case 49:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -1824,13 +1839,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 55;
+          _context.next = 56;
           break;
-        case 52:
-          _context.prev = 52;
-          _context.t0 = _context["catch"](45);
+        case 53:
+          _context.prev = 53;
+          _context.t0 = _context["catch"](46);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 55:
+        case 56:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -1861,17 +1876,17 @@ export var orderBack = /*#__PURE__*/function () {
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 64;
+          _context.next = 65;
           break;
-        case 61:
-          _context.prev = 61;
+        case 62:
+          _context.prev = 62;
           _context.t1 = _context["catch"](8);
           console.error(_context.t1);
-        case 64:
+        case 65:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8, 61], [45, 52]]);
+    }, _callee, null, [[8, 62], [46, 53]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -2282,7 +2297,7 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
-    return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType);
+    return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
   });
   if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
   var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.29.1",
+  "version": "0.29.2-rc.2",
   "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": "^0.29.1",
-    "@kmkf-fe-packages/kmkf-utils": "^0.29.1",
-    "@kmkf-fe-packages/services-components": "^0.29.1",
+    "@kmkf-fe-packages/basic-components": "^0.29.2-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.29.2-rc.0",
+    "@kmkf-fe-packages/services-components": "^0.29.2-rc.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d7f02fd1d23be055f12d6cdbcfec8caae9645396",
+  "gitHead": "f3e9a40334902844ccacbc6d9ed623348ec9f129",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }