@kmkf-fe-packages/kmkf-work-order-service-component 2.0.22 → 2.0.24

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

@@ -27,6 +27,7 @@ import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
 import submitDataTransOldFormat from "./submitDataTransOldFormat";
 import xzSDK from "./xzSDK";
+import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { orderBackMap } from "./tools_constants";
 // 淘宝商品组件信息处理
 
@@ -247,6 +248,7 @@ export var orderBack = /*#__PURE__*/function () {
             kmOrder: kmOrder,
             gyOrder: gyOrder
           });
+          pushGyLog('gyOrder', gyOrder);
           if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
             message.warning(data === null || data === void 0 ? void 0 : (_data$value2 = data.value) === null || _data$value2 === void 0 ? void 0 : _data$value2.message);
           }
@@ -265,6 +267,7 @@ export var orderBack = /*#__PURE__*/function () {
           kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
           gyOrders.trades = filterGyOrders(gyOrders, order_no);
           jstOrders.trades = filterJstOrders(jstOrders, order_no);
+          pushGyLog('gyOrders', gyOrders);
           Monitor.automaticReport({
             message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\u5E97\u94FAid:").concat(shopId, ", \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo), ",jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders), ",\n      bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders), ", km\u4FE1\u606F:").concat(JSON.stringify(kmOrders), ",\u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders))
           });
@@ -291,6 +294,7 @@ export var orderBack = /*#__PURE__*/function () {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
+          pushGyLog('gyInfo', gyInfo);
           jstInfo = jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
@@ -359,6 +363,7 @@ export var orderBack = /*#__PURE__*/function () {
               sendId: '',
               sendName: ''
             }];
+            pushGyLog('gyInfo_after', gyInfo);
           }
           if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
             kmInfo.kmSendGood = [{
@@ -372,15 +377,15 @@ export var orderBack = /*#__PURE__*/function () {
               orders: []
             });
             jstInfo.jstLogistics = [{
-              logisticsCode: ""
+              logisticsCode: ''
             }];
             jstInfo.jstSendGood = [{
               sendId: '',
               sendName: ''
             }];
             jstInfo.jstSupply = [{
-              supplyName: "",
-              supplyId: ""
+              supplyName: '',
+              supplyId: ''
             }];
             jstInfo.jstItemSelectThird = [];
           }
@@ -395,7 +400,9 @@ export var orderBack = /*#__PURE__*/function () {
             bsE3Order: bsE3Info,
             kmOrder: kmInfo,
             gyOrder: gyInfo
-          }); //抖音数据特殊处理
+          });
+          pushGyLog('detail', detail);
+          //抖音数据特殊处理
           if (shopSourceStr === 'FXG') {
             detail = updateDYDetails(detail);
           } else if (shopSourceStr === 'SPH' || shopSourceStr === 'WXXD') {
@@ -405,7 +412,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 85;
+            _context.next = 89;
             break;
           }
           list = detail['itemList'];
@@ -423,10 +430,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 75;
-          _context.next = 78;
+          _context.prev = 79;
+          _context.next = 82;
           return Promise.all(promises);
-        case 78:
+        case 82:
           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), {}, {
@@ -436,13 +443,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 85;
+          _context.next = 89;
           break;
-        case 82:
-          _context.prev = 82;
-          _context.t1 = _context["catch"](75);
+        case 86:
+          _context.prev = 86;
+          _context.t1 = _context["catch"](79);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 85:
+        case 89:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -452,6 +459,7 @@ export var orderBack = /*#__PURE__*/function () {
             type: type,
             fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
           });
+          pushGyLog('values', values);
           console.log('formValue', formValue);
           console.log('values', values, {
             type: type,
@@ -485,18 +493,22 @@ export var orderBack = /*#__PURE__*/function () {
             fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
             shopId: shopId
           }));
+          pushGyLog('setFieldsValue', _objectSpread(_objectSpread(_objectSpread({}, formValue), values), {}, {
+            fixed_field_buyerOpenUid: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.buyerOpenUid,
+            shopId: shopId
+          }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 96;
+          _context.next = 102;
           break;
-        case 93:
-          _context.prev = 93;
+        case 99:
+          _context.prev = 99;
           _context.t2 = _context["catch"](18);
           console.error(_context.t2);
-        case 96:
+        case 102:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[3, 10], [18, 93], [75, 82]]);
+    }, _callee, null, [[3, 10], [18, 99], [79, 86]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

package/package.json

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