@kmkf-fe-packages/kmkf-work-order-service-component 0.23.0 → 0.23.1-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } fro
|
|
|
28
28
|
import 'moment/locale/zh-cn';
|
|
29
29
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
30
30
|
// 重复检验不需要展示在顶部的
|
|
31
|
-
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail } from "../../../common/utils/tools";
|
|
31
|
+
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues } from "../../../common/utils/tools";
|
|
32
32
|
import { replaceCheck, orderDetail } from "../../../model/servers/api";
|
|
33
33
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
34
34
|
import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
|
|
@@ -507,6 +507,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
507
507
|
//订单返填
|
|
508
508
|
var changeHandle = function changeHandle(order_no) {
|
|
509
509
|
if (!order_no) return;
|
|
510
|
+
console.log('[订单返填 changeHandle order_no ] >', order_no);
|
|
510
511
|
orderBack({
|
|
511
512
|
order_no: order_no,
|
|
512
513
|
form: form,
|
|
@@ -539,6 +540,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
539
540
|
form: form
|
|
540
541
|
});
|
|
541
542
|
}
|
|
543
|
+
if (workOrderComponentType === 'WDT_SYSTEM_ORDER') {
|
|
544
|
+
wdtSystemOrderBackValues({
|
|
545
|
+
templateList: templateDetail,
|
|
546
|
+
value: value,
|
|
547
|
+
form: form
|
|
548
|
+
});
|
|
549
|
+
}
|
|
542
550
|
};
|
|
543
551
|
|
|
544
552
|
//组件失焦事件
|
|
@@ -579,7 +587,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
579
587
|
setShopId(val);
|
|
580
588
|
// 清空表单字段
|
|
581
589
|
var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
|
|
582
|
-
if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
590
|
+
if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
|
|
583
591
|
cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
|
|
584
592
|
}
|
|
585
593
|
return cur;
|
|
@@ -617,13 +625,14 @@ var FormRender = function FormRender(props, ref) {
|
|
|
617
625
|
}
|
|
618
626
|
//如果有bs组件 设置成初始值
|
|
619
627
|
var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
|
|
620
|
-
return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
|
|
628
|
+
return ['BS_LOGISTICS', 'BS_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType);
|
|
621
629
|
});
|
|
622
630
|
if (hasBs) {
|
|
623
631
|
var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
|
|
624
632
|
switch (next.workOrderComponentType) {
|
|
625
633
|
case 'BS_LOGISTICS':
|
|
626
634
|
case 'WLN_LOGISTICS':
|
|
635
|
+
case 'WDT_LOGISTICS':
|
|
627
636
|
prv[next.uniqueKey] = [{
|
|
628
637
|
logisticsCompany: null,
|
|
629
638
|
logisticsCode: null
|
|
@@ -631,6 +640,7 @@ var FormRender = function FormRender(props, ref) {
|
|
|
631
640
|
break;
|
|
632
641
|
case 'BS_SEND_GOOD':
|
|
633
642
|
case 'WLN_SEND_GOOD':
|
|
643
|
+
case 'WDT_SEND_GOOD':
|
|
634
644
|
prv[next.uniqueKey] = [{
|
|
635
645
|
sendName: '',
|
|
636
646
|
sendId: ''
|
|
@@ -103,6 +103,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
|
|
|
103
103
|
}) => void;
|
|
104
104
|
export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
105
105
|
export declare const wlnSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
106
|
+
export declare const wdtSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
106
107
|
export declare const getMappingConfigByTemplateDetail: (templateDetail: {
|
|
107
108
|
componentDtoList: any;
|
|
108
109
|
uniqueKey: string;
|
|
@@ -19,9 +19,9 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
|
|
|
19
19
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
20
20
|
import { get, every, maxBy } from 'lodash';
|
|
21
21
|
import V from 'voca';
|
|
22
|
-
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail } from "../../model/servers/api";
|
|
22
|
+
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
|
|
23
23
|
import moment from 'moment';
|
|
24
|
-
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
|
+
import { AddressData, ExpressData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, unTransField } from '@kmkf-fe-packages/kmkf-utils';
|
|
25
25
|
import { cloneDeep, isEqual, set } from 'lodash';
|
|
26
26
|
import Monitor from 'kmkf-monitor';
|
|
27
27
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
@@ -644,7 +644,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
644
644
|
}),
|
|
645
645
|
name: item.name
|
|
646
646
|
});
|
|
647
|
-
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS'].includes(item.workOrderComponentType)) {
|
|
647
|
+
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(item.workOrderComponentType)) {
|
|
648
648
|
var logisticsMap = {
|
|
649
649
|
BS_LOGISTICS: {
|
|
650
650
|
list: 'bsLogisticsList',
|
|
@@ -655,6 +655,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
655
655
|
list: 'wlnLogisticsList',
|
|
656
656
|
company: 'wlnLogisticsCompany',
|
|
657
657
|
code: 'wlnLogisticsCode'
|
|
658
|
+
},
|
|
659
|
+
WDT_LOGISTICS: {
|
|
660
|
+
list: 'wdtLogisticsList',
|
|
661
|
+
company: 'wdtLogisticsCompany',
|
|
662
|
+
code: 'wdtLogisticsCode'
|
|
658
663
|
}
|
|
659
664
|
};
|
|
660
665
|
var bsLogisticsList = get(nowData, "".concat(item.uniqueKey), []);
|
|
@@ -686,7 +691,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
686
691
|
}),
|
|
687
692
|
name: item.name
|
|
688
693
|
});
|
|
689
|
-
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD'].includes(item.workOrderComponentType)) {
|
|
694
|
+
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(item.workOrderComponentType)) {
|
|
690
695
|
var sendGoodMap = {
|
|
691
696
|
BS_SEND_GOOD: {
|
|
692
697
|
list: 'bsSendGood',
|
|
@@ -697,6 +702,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
697
702
|
list: 'wlnSendGood',
|
|
698
703
|
id: 'wlnSendId',
|
|
699
704
|
name: 'wlnSendName'
|
|
705
|
+
},
|
|
706
|
+
WDT_SEND_GOOD: {
|
|
707
|
+
list: 'wdtSendGood',
|
|
708
|
+
id: 'wdtSendId',
|
|
709
|
+
name: 'wdtSendName'
|
|
700
710
|
}
|
|
701
711
|
};
|
|
702
712
|
var bsSendList = get(nowData, "".concat(item.uniqueKey), []);
|
|
@@ -850,7 +860,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
850
860
|
content: get(nowData, "".concat(item.uniqueKey, ".postingReceiverMobile"), ''),
|
|
851
861
|
name: item.name
|
|
852
862
|
});
|
|
853
|
-
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
|
|
863
|
+
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
|
|
854
864
|
var systemOrderMap = {
|
|
855
865
|
BS_SYSTEM_ORDER: {
|
|
856
866
|
no: 'bsSystemOrderNo',
|
|
@@ -861,6 +871,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
861
871
|
no: 'wlnSystemOrderNo',
|
|
862
872
|
ids: 'wlnSystemSelectIds',
|
|
863
873
|
order: 'wlnSystemShowOrder'
|
|
874
|
+
},
|
|
875
|
+
WDT_SYSTEM_ORDER: {
|
|
876
|
+
no: 'wdtSystemOrderNo',
|
|
877
|
+
ids: 'wdtSystemSelectIds',
|
|
878
|
+
order: 'wdtSystemShowOrder'
|
|
864
879
|
}
|
|
865
880
|
};
|
|
866
881
|
var selectIds = get(nowData, "".concat(item.uniqueKey, ".selectIds"), '');
|
|
@@ -1281,13 +1296,16 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1281
1296
|
reason: '',
|
|
1282
1297
|
systemOrderId: ''
|
|
1283
1298
|
}])));
|
|
1284
|
-
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS'].includes(nex.workOrderComponentType)) {
|
|
1299
|
+
} else if (['BS_LOGISTICS', 'WLN_LOGISTICS', 'WDT_LOGISTICS'].includes(nex.workOrderComponentType)) {
|
|
1285
1300
|
var LogisticsMap = {
|
|
1286
1301
|
BS_LOGISTICS: {
|
|
1287
1302
|
listKey: 'bsLogisticsList'
|
|
1288
1303
|
},
|
|
1289
1304
|
WLN_LOGISTICS: {
|
|
1290
1305
|
listKey: 'wlnLogisticsList'
|
|
1306
|
+
},
|
|
1307
|
+
WDT_LOGISTICS: {
|
|
1308
|
+
listKey: 'wdtLogisticsList'
|
|
1291
1309
|
}
|
|
1292
1310
|
};
|
|
1293
1311
|
var _itemList7 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(LogisticsMap[nex.workOrderComponentType].listKey)], [{
|
|
@@ -1298,13 +1316,16 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1298
1316
|
logisticsCompany: null,
|
|
1299
1317
|
logisticsCode: null
|
|
1300
1318
|
}]));
|
|
1301
|
-
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD'].includes(nex.workOrderComponentType)) {
|
|
1319
|
+
} else if (['BS_SEND_GOOD', 'WLN_SEND_GOOD', 'WDT_SEND_GOOD'].includes(nex.workOrderComponentType)) {
|
|
1302
1320
|
var sendGoodMap = {
|
|
1303
1321
|
BS_SEND_GOOD: {
|
|
1304
1322
|
list: 'bsSendGood'
|
|
1305
1323
|
},
|
|
1306
1324
|
WLN_SEND_GOOD: {
|
|
1307
1325
|
list: 'wlnSendGood'
|
|
1326
|
+
},
|
|
1327
|
+
WDT_SEND_GOOD: {
|
|
1328
|
+
list: 'wdtSendGood'
|
|
1308
1329
|
}
|
|
1309
1330
|
};
|
|
1310
1331
|
var _itemList8 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_").concat(sendGoodMap[nex.workOrderComponentType].list)], [{
|
|
@@ -1388,7 +1409,7 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1388
1409
|
bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
|
|
1389
1410
|
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1390
1411
|
}));
|
|
1391
|
-
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1412
|
+
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1392
1413
|
var systemOrderMap = {
|
|
1393
1414
|
BS_SYSTEM_ORDER: {
|
|
1394
1415
|
no: 'bsSystemOrderNo',
|
|
@@ -1399,6 +1420,11 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1399
1420
|
no: 'wlnSystemOrderNo',
|
|
1400
1421
|
ids: 'wlnSystemSelectIds',
|
|
1401
1422
|
order: 'wlnSystemShowOrder'
|
|
1423
|
+
},
|
|
1424
|
+
WDT_SYSTEM_ORDER: {
|
|
1425
|
+
no: 'wdtSystemOrderNo',
|
|
1426
|
+
ids: 'wdtSystemSelectIds',
|
|
1427
|
+
order: 'wdtSystemShowOrder'
|
|
1402
1428
|
}
|
|
1403
1429
|
};
|
|
1404
1430
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
@@ -1467,7 +1493,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
|
1467
1493
|
//订单返填
|
|
1468
1494
|
export var orderBack = /*#__PURE__*/function () {
|
|
1469
1495
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
1470
|
-
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, orderInfo, jstInfo, bsOrders, wlnOrders, bsInfo, wlnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread68, _cacheOrderInfo;
|
|
1496
|
+
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, _objectSpread68, _cacheOrderInfo;
|
|
1471
1497
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1472
1498
|
while (1) switch (_context.prev = _context.next) {
|
|
1473
1499
|
case 0:
|
|
@@ -1476,18 +1502,32 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1476
1502
|
JOIN_SHOP = shopList.find(function (item) {
|
|
1477
1503
|
return !item.notJoin && item.shopId == shopId;
|
|
1478
1504
|
}); //判断是否有百胜组件 有就请求bs订单接口
|
|
1479
|
-
hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']);
|
|
1505
|
+
hasBs = HasFilterHandle(templateDetail, ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO']); //判断是否有旺店通组件 有就请求wdt订单接口
|
|
1506
|
+
hasWdt = HasFilterHandle(templateDetail, [
|
|
1507
|
+
// 'WDT_SIGNING_TIME',
|
|
1508
|
+
// 'WDT_SEND_TIME',
|
|
1509
|
+
// 'WDT_TRADE_PAYMENT_TIME',
|
|
1510
|
+
// 'WDT_NET_RECEIPTS',
|
|
1511
|
+
// 'WDT_PACKAGE_WEIGHT',
|
|
1512
|
+
// 'WDT_GOODS',
|
|
1513
|
+
// 'WDT_DEPOSIT',
|
|
1514
|
+
// 'WDT_LOGISTICS',
|
|
1515
|
+
// 'WDT_SEND_GOOD',
|
|
1516
|
+
// 'WDT_POSTING',
|
|
1517
|
+
'WDT_SYSTEM_ORDER'
|
|
1518
|
+
// 'WDT_DELIVERY_NO',
|
|
1519
|
+
]); //判断是否有万里牛组件 有就请求wln订单接口
|
|
1480
1520
|
hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
|
|
1481
|
-
if (!(!JOIN_SHOP && !hasBs && !hasWln)) {
|
|
1482
|
-
_context.next =
|
|
1521
|
+
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
|
|
1522
|
+
_context.next = 7;
|
|
1483
1523
|
break;
|
|
1484
1524
|
}
|
|
1485
1525
|
return _context.abrupt("return");
|
|
1486
|
-
case
|
|
1526
|
+
case 7:
|
|
1487
1527
|
_ref3 = shopList.find(function (item) {
|
|
1488
1528
|
return item.shopId == shopId;
|
|
1489
1529
|
}) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
|
|
1490
|
-
_context.prev =
|
|
1530
|
+
_context.prev = 8;
|
|
1491
1531
|
promise = [];
|
|
1492
1532
|
if (!JOIN_SHOP) {
|
|
1493
1533
|
promise.push(new Promise(function (resolve) {
|
|
@@ -1538,21 +1578,32 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1538
1578
|
resolve({});
|
|
1539
1579
|
}));
|
|
1540
1580
|
}
|
|
1541
|
-
|
|
1581
|
+
if (hasWdt) {
|
|
1582
|
+
promise.push(wdtOrderDetail({
|
|
1583
|
+
billNo: order_no
|
|
1584
|
+
}));
|
|
1585
|
+
} else {
|
|
1586
|
+
promise.push(new Promise(function (resolve) {
|
|
1587
|
+
resolve([]);
|
|
1588
|
+
}));
|
|
1589
|
+
}
|
|
1590
|
+
_context.next = 18;
|
|
1542
1591
|
return Promise.allSettled(promise);
|
|
1543
|
-
case
|
|
1592
|
+
case 18:
|
|
1544
1593
|
_yield$Promise$allSet = _context.sent;
|
|
1545
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
1594
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 5);
|
|
1546
1595
|
data = _yield$Promise$allSet2[0];
|
|
1547
1596
|
jstOrder = _yield$Promise$allSet2[1];
|
|
1548
1597
|
bsOrder = _yield$Promise$allSet2[2];
|
|
1549
1598
|
wlnOrder = _yield$Promise$allSet2[3];
|
|
1599
|
+
wdtOrder = _yield$Promise$allSet2[4];
|
|
1550
1600
|
orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
|
|
1551
1601
|
jstInfo = (jstOrder === null || jstOrder === void 0 ? void 0 : (_jstOrder$value = jstOrder.value) === null || _jstOrder$value === void 0 ? void 0 : (_jstOrder$value$data = _jstOrder$value.data) === null || _jstOrder$value$data === void 0 ? void 0 : _jstOrder$value$data.orders) || [];
|
|
1552
1602
|
bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
|
|
1553
1603
|
wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
|
|
1604
|
+
wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
|
|
1554
1605
|
Monitor.automaticReport({
|
|
1555
|
-
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(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders))
|
|
1606
|
+
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(jstInfo), ",bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders), ",wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders), ",wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders))
|
|
1556
1607
|
});
|
|
1557
1608
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
1558
1609
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -1561,6 +1612,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1561
1612
|
}
|
|
1562
1613
|
bsInfo = bsOrderTransform(bsOrders || {});
|
|
1563
1614
|
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
1615
|
+
wdtInfo = wdtOrderTransform(wdtOrders || {});
|
|
1564
1616
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
1565
1617
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
1566
1618
|
bsGoods: []
|
|
@@ -1590,13 +1642,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1590
1642
|
sendName: ''
|
|
1591
1643
|
}];
|
|
1592
1644
|
}
|
|
1645
|
+
// if (wdtOrders?.orders?.length > 1) {
|
|
1646
|
+
// wdtInfo.bsGoods = {
|
|
1647
|
+
// ...wdtInfo.bsGoods,
|
|
1648
|
+
// bsGoods: [],
|
|
1649
|
+
// };
|
|
1650
|
+
// wdtInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
|
|
1651
|
+
// wdtInfo.bsSendGood = [{ sendId: '', sendName: '' }];
|
|
1652
|
+
// wdtInfo.bsDeliveryNo = [{ deliveryNo: '' }];
|
|
1653
|
+
// }
|
|
1593
1654
|
|
|
1594
1655
|
//获取当前表单字段
|
|
1595
1656
|
formValue = form.getFieldsValue();
|
|
1596
1657
|
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
|
1597
1658
|
jstItemList: jstInfo,
|
|
1598
1659
|
bsOrder: bsInfo,
|
|
1599
|
-
wlnOrder: wlnInfo
|
|
1660
|
+
wlnOrder: wlnInfo,
|
|
1661
|
+
wdtOrder: wdtInfo
|
|
1600
1662
|
}); //抖音数据特殊处理
|
|
1601
1663
|
if (shopSourceStr === 'FXG') {
|
|
1602
1664
|
detail = updateDYDetails(detail);
|
|
@@ -1607,7 +1669,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1607
1669
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
1608
1670
|
erpPromiseList = [];
|
|
1609
1671
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
1610
|
-
_context.next =
|
|
1672
|
+
_context.next = 55;
|
|
1611
1673
|
break;
|
|
1612
1674
|
}
|
|
1613
1675
|
list = detail['itemList'];
|
|
@@ -1625,10 +1687,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1625
1687
|
resolve({});
|
|
1626
1688
|
});
|
|
1627
1689
|
});
|
|
1628
|
-
_context.prev =
|
|
1629
|
-
_context.next =
|
|
1690
|
+
_context.prev = 45;
|
|
1691
|
+
_context.next = 48;
|
|
1630
1692
|
return Promise.all(promises);
|
|
1631
|
-
case
|
|
1693
|
+
case 48:
|
|
1632
1694
|
erpPromiseList = _context.sent;
|
|
1633
1695
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
1634
1696
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -1638,13 +1700,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1638
1700
|
})
|
|
1639
1701
|
});
|
|
1640
1702
|
});
|
|
1641
|
-
_context.next =
|
|
1703
|
+
_context.next = 55;
|
|
1642
1704
|
break;
|
|
1643
|
-
case
|
|
1644
|
-
_context.prev =
|
|
1645
|
-
_context.t0 = _context["catch"](
|
|
1705
|
+
case 52:
|
|
1706
|
+
_context.prev = 52;
|
|
1707
|
+
_context.t0 = _context["catch"](45);
|
|
1646
1708
|
console.error('调用erp获取宝贝编码错误', _context.t0);
|
|
1647
|
-
case
|
|
1709
|
+
case 55:
|
|
1648
1710
|
// console.log('detail', detail);
|
|
1649
1711
|
values = orderBackFormValues({
|
|
1650
1712
|
detail: detail,
|
|
@@ -1675,17 +1737,17 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1675
1737
|
// console.log('orderback', values);
|
|
1676
1738
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
|
1677
1739
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
1678
|
-
_context.next =
|
|
1740
|
+
_context.next = 64;
|
|
1679
1741
|
break;
|
|
1680
|
-
case
|
|
1681
|
-
_context.prev =
|
|
1682
|
-
_context.t1 = _context["catch"](
|
|
1742
|
+
case 61:
|
|
1743
|
+
_context.prev = 61;
|
|
1744
|
+
_context.t1 = _context["catch"](8);
|
|
1683
1745
|
console.error(_context.t1);
|
|
1684
|
-
case
|
|
1746
|
+
case 64:
|
|
1685
1747
|
case "end":
|
|
1686
1748
|
return _context.stop();
|
|
1687
1749
|
}
|
|
1688
|
-
}, _callee, null, [[
|
|
1750
|
+
}, _callee, null, [[8, 61], [45, 52]]);
|
|
1689
1751
|
}));
|
|
1690
1752
|
return function orderBack(_x) {
|
|
1691
1753
|
return _ref2.apply(this, arguments);
|
|
@@ -2082,6 +2144,29 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref7) {
|
|
|
2082
2144
|
form.setFieldsValue(values);
|
|
2083
2145
|
};
|
|
2084
2146
|
|
|
2147
|
+
// wdt商品信息返填
|
|
2148
|
+
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
|
|
2149
|
+
var _templateList$compone3;
|
|
2150
|
+
var templateList = _ref8.templateList,
|
|
2151
|
+
value = _ref8.value,
|
|
2152
|
+
form = _ref8.form;
|
|
2153
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
2154
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
2155
|
+
var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
|
|
2156
|
+
return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType);
|
|
2157
|
+
});
|
|
2158
|
+
if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
|
|
2159
|
+
var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);
|
|
2160
|
+
var orderInfo = wdtOrderTransform({
|
|
2161
|
+
orders: value.selectedRows,
|
|
2162
|
+
shopCode: wdtGoodsValue.shopCode
|
|
2163
|
+
});
|
|
2164
|
+
var values = wdtOrderBackFormValues(orderInfo, {
|
|
2165
|
+
componentDtoList: wdtGoodsComponent
|
|
2166
|
+
});
|
|
2167
|
+
form.setFieldsValue(values);
|
|
2168
|
+
};
|
|
2169
|
+
|
|
2085
2170
|
// 获取映射关系
|
|
2086
2171
|
export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplateDetail(templateDetail) {
|
|
2087
2172
|
var readonlyComponents = {};
|
|
@@ -59,6 +59,7 @@ export declare const queryAllWorkOrderList: (s: string, data: any) => Promise<an
|
|
|
59
59
|
export declare const getAlipayBillReceipt: (data: any) => Promise<any>;
|
|
60
60
|
export declare const jstOrderDetail: (data: any) => Promise<any>;
|
|
61
61
|
export declare const bsOrderDetail: (data: any) => Promise<any>;
|
|
62
|
+
export declare const wdtOrderDetail: (data: any) => Promise<any>;
|
|
62
63
|
export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
|
|
63
64
|
export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
|
|
64
65
|
export declare const queryLogisticsTrack: (data: any) => Promise<any>;
|
|
@@ -370,6 +370,16 @@ export var bsOrderDetail = function bsOrderDetail(data) {
|
|
|
370
370
|
});
|
|
371
371
|
};
|
|
372
372
|
|
|
373
|
+
// wdt订单详情
|
|
374
|
+
export var wdtOrderDetail = function wdtOrderDetail(data) {
|
|
375
|
+
return request({
|
|
376
|
+
url: '/qy/gdfw/order/wdtOrderDetail',
|
|
377
|
+
method: 'post',
|
|
378
|
+
data: data,
|
|
379
|
+
infoLevel: 'warning'
|
|
380
|
+
});
|
|
381
|
+
};
|
|
382
|
+
|
|
373
383
|
// 获取重复详情
|
|
374
384
|
export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {
|
|
375
385
|
return request({
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "0.23.
|
|
3
|
+
"version": "0.23.1-beta.1",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "^0.23.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "^0.23.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "^0.23.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "^0.23.1-beta.1",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "^0.23.1-beta.1",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "^0.23.1-beta.1",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"publishConfig": {
|
|
75
75
|
"access": "public"
|
|
76
76
|
},
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "7767b6fb6b50a7f3db6e12b0d6b5bcf643e5e89e",
|
|
78
78
|
"gitHooks": {
|
|
79
79
|
"pre-commit": "lint-staged"
|
|
80
80
|
}
|