@kmkf-fe-packages/kmkf-work-order-service-component 0.23.0 → 0.23.1-alpha.0
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_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;
|
|
@@ -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";
|
|
@@ -850,7 +850,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
850
850
|
content: get(nowData, "".concat(item.uniqueKey, ".postingReceiverMobile"), ''),
|
|
851
851
|
name: item.name
|
|
852
852
|
});
|
|
853
|
-
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
|
|
853
|
+
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(item.workOrderComponentType)) {
|
|
854
854
|
var systemOrderMap = {
|
|
855
855
|
BS_SYSTEM_ORDER: {
|
|
856
856
|
no: 'bsSystemOrderNo',
|
|
@@ -861,6 +861,11 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
|
|
|
861
861
|
no: 'wlnSystemOrderNo',
|
|
862
862
|
ids: 'wlnSystemSelectIds',
|
|
863
863
|
order: 'wlnSystemShowOrder'
|
|
864
|
+
},
|
|
865
|
+
WDT_SYSTEM_ORDER: {
|
|
866
|
+
no: 'wdtSystemOrderNo',
|
|
867
|
+
ids: 'wdtSystemSelectIds',
|
|
868
|
+
order: 'wdtSystemShowOrder'
|
|
864
869
|
}
|
|
865
870
|
};
|
|
866
871
|
var selectIds = get(nowData, "".concat(item.uniqueKey, ".selectIds"), '');
|
|
@@ -1388,7 +1393,7 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1388
1393
|
bsReturnGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_bsReturnGoods")], []),
|
|
1389
1394
|
shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
|
|
1390
1395
|
}));
|
|
1391
|
-
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1396
|
+
} else if (['BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WDT_SYSTEM_ORDER'].includes(nex.workOrderComponentType)) {
|
|
1392
1397
|
var systemOrderMap = {
|
|
1393
1398
|
BS_SYSTEM_ORDER: {
|
|
1394
1399
|
no: 'bsSystemOrderNo',
|
|
@@ -1399,6 +1404,11 @@ var transDataSource = function transDataSource(templateColumns) {
|
|
|
1399
1404
|
no: 'wlnSystemOrderNo',
|
|
1400
1405
|
ids: 'wlnSystemSelectIds',
|
|
1401
1406
|
order: 'wlnSystemShowOrder'
|
|
1407
|
+
},
|
|
1408
|
+
WDT_SYSTEM_ORDER: {
|
|
1409
|
+
no: 'wdtSystemOrderNo',
|
|
1410
|
+
ids: 'wdtSystemSelectIds',
|
|
1411
|
+
order: 'wdtSystemShowOrder'
|
|
1402
1412
|
}
|
|
1403
1413
|
};
|
|
1404
1414
|
return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
|
|
@@ -1467,7 +1477,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
|
1467
1477
|
//订单返填
|
|
1468
1478
|
export var orderBack = /*#__PURE__*/function () {
|
|
1469
1479
|
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;
|
|
1480
|
+
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
1481
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
1472
1482
|
while (1) switch (_context.prev = _context.next) {
|
|
1473
1483
|
case 0:
|
|
@@ -1476,18 +1486,32 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1476
1486
|
JOIN_SHOP = shopList.find(function (item) {
|
|
1477
1487
|
return !item.notJoin && item.shopId == shopId;
|
|
1478
1488
|
}); //判断是否有百胜组件 有就请求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']);
|
|
1489
|
+
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订单接口
|
|
1490
|
+
hasWdt = HasFilterHandle(templateDetail, [
|
|
1491
|
+
// 'WDT_SIGNING_TIME',
|
|
1492
|
+
// 'WDT_SEND_TIME',
|
|
1493
|
+
// 'WDT_TRADE_PAYMENT_TIME',
|
|
1494
|
+
// 'WDT_NET_RECEIPTS',
|
|
1495
|
+
// 'WDT_PACKAGE_WEIGHT',
|
|
1496
|
+
// 'WDT_GOODS',
|
|
1497
|
+
// 'WDT_DEPOSIT',
|
|
1498
|
+
// 'WDT_LOGISTICS',
|
|
1499
|
+
// 'WDT_SEND_GOOD',
|
|
1500
|
+
// 'WDT_POSTING',
|
|
1501
|
+
'WDT_SYSTEM_ORDER'
|
|
1502
|
+
// 'WDT_DELIVERY_NO',
|
|
1503
|
+
]); //判断是否有万里牛组件 有就请求wln订单接口
|
|
1480
1504
|
hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且百胜组件都没有
|
|
1481
|
-
if (!(!JOIN_SHOP && !hasBs && !hasWln)) {
|
|
1482
|
-
_context.next =
|
|
1505
|
+
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt)) {
|
|
1506
|
+
_context.next = 7;
|
|
1483
1507
|
break;
|
|
1484
1508
|
}
|
|
1485
1509
|
return _context.abrupt("return");
|
|
1486
|
-
case
|
|
1510
|
+
case 7:
|
|
1487
1511
|
_ref3 = shopList.find(function (item) {
|
|
1488
1512
|
return item.shopId == shopId;
|
|
1489
1513
|
}) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
|
|
1490
|
-
_context.prev =
|
|
1514
|
+
_context.prev = 8;
|
|
1491
1515
|
promise = [];
|
|
1492
1516
|
if (!JOIN_SHOP) {
|
|
1493
1517
|
promise.push(new Promise(function (resolve) {
|
|
@@ -1538,21 +1562,32 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1538
1562
|
resolve({});
|
|
1539
1563
|
}));
|
|
1540
1564
|
}
|
|
1541
|
-
|
|
1565
|
+
if (hasWdt) {
|
|
1566
|
+
promise.push(wdtOrderDetail({
|
|
1567
|
+
billNo: order_no
|
|
1568
|
+
}));
|
|
1569
|
+
} else {
|
|
1570
|
+
promise.push(new Promise(function (resolve) {
|
|
1571
|
+
resolve([]);
|
|
1572
|
+
}));
|
|
1573
|
+
}
|
|
1574
|
+
_context.next = 18;
|
|
1542
1575
|
return Promise.allSettled(promise);
|
|
1543
|
-
case
|
|
1576
|
+
case 18:
|
|
1544
1577
|
_yield$Promise$allSet = _context.sent;
|
|
1545
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
1578
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 5);
|
|
1546
1579
|
data = _yield$Promise$allSet2[0];
|
|
1547
1580
|
jstOrder = _yield$Promise$allSet2[1];
|
|
1548
1581
|
bsOrder = _yield$Promise$allSet2[2];
|
|
1549
1582
|
wlnOrder = _yield$Promise$allSet2[3];
|
|
1583
|
+
wdtOrder = _yield$Promise$allSet2[4];
|
|
1550
1584
|
orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
|
|
1551
1585
|
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
1586
|
bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
|
|
1553
1587
|
wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
|
|
1588
|
+
wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
|
|
1554
1589
|
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))
|
|
1590
|
+
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
1591
|
});
|
|
1557
1592
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
1558
1593
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -1561,6 +1596,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1561
1596
|
}
|
|
1562
1597
|
bsInfo = bsOrderTransform(bsOrders || {});
|
|
1563
1598
|
wlnInfo = wlnOrderTransform(wlnOrders || {});
|
|
1599
|
+
wdtInfo = wdtOrderTransform(wdtOrders || {});
|
|
1564
1600
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
1565
1601
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
1566
1602
|
bsGoods: []
|
|
@@ -1590,13 +1626,23 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1590
1626
|
sendName: ''
|
|
1591
1627
|
}];
|
|
1592
1628
|
}
|
|
1629
|
+
// if (wdtOrders?.orders?.length > 1) {
|
|
1630
|
+
// wdtInfo.bsGoods = {
|
|
1631
|
+
// ...wdtInfo.bsGoods,
|
|
1632
|
+
// bsGoods: [],
|
|
1633
|
+
// };
|
|
1634
|
+
// wdtInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
|
|
1635
|
+
// wdtInfo.bsSendGood = [{ sendId: '', sendName: '' }];
|
|
1636
|
+
// wdtInfo.bsDeliveryNo = [{ deliveryNo: '' }];
|
|
1637
|
+
// }
|
|
1593
1638
|
|
|
1594
1639
|
//获取当前表单字段
|
|
1595
1640
|
formValue = form.getFieldsValue();
|
|
1596
1641
|
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
|
1597
1642
|
jstItemList: jstInfo,
|
|
1598
1643
|
bsOrder: bsInfo,
|
|
1599
|
-
wlnOrder: wlnInfo
|
|
1644
|
+
wlnOrder: wlnInfo,
|
|
1645
|
+
wdtOrder: wdtInfo
|
|
1600
1646
|
}); //抖音数据特殊处理
|
|
1601
1647
|
if (shopSourceStr === 'FXG') {
|
|
1602
1648
|
detail = updateDYDetails(detail);
|
|
@@ -1607,7 +1653,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1607
1653
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
1608
1654
|
erpPromiseList = [];
|
|
1609
1655
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
1610
|
-
_context.next =
|
|
1656
|
+
_context.next = 55;
|
|
1611
1657
|
break;
|
|
1612
1658
|
}
|
|
1613
1659
|
list = detail['itemList'];
|
|
@@ -1625,10 +1671,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1625
1671
|
resolve({});
|
|
1626
1672
|
});
|
|
1627
1673
|
});
|
|
1628
|
-
_context.prev =
|
|
1629
|
-
_context.next =
|
|
1674
|
+
_context.prev = 45;
|
|
1675
|
+
_context.next = 48;
|
|
1630
1676
|
return Promise.all(promises);
|
|
1631
|
-
case
|
|
1677
|
+
case 48:
|
|
1632
1678
|
erpPromiseList = _context.sent;
|
|
1633
1679
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
1634
1680
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -1638,13 +1684,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1638
1684
|
})
|
|
1639
1685
|
});
|
|
1640
1686
|
});
|
|
1641
|
-
_context.next =
|
|
1687
|
+
_context.next = 55;
|
|
1642
1688
|
break;
|
|
1643
|
-
case
|
|
1644
|
-
_context.prev =
|
|
1645
|
-
_context.t0 = _context["catch"](
|
|
1689
|
+
case 52:
|
|
1690
|
+
_context.prev = 52;
|
|
1691
|
+
_context.t0 = _context["catch"](45);
|
|
1646
1692
|
console.error('调用erp获取宝贝编码错误', _context.t0);
|
|
1647
|
-
case
|
|
1693
|
+
case 55:
|
|
1648
1694
|
// console.log('detail', detail);
|
|
1649
1695
|
values = orderBackFormValues({
|
|
1650
1696
|
detail: detail,
|
|
@@ -1675,17 +1721,17 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
1675
1721
|
// console.log('orderback', values);
|
|
1676
1722
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
|
1677
1723
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
1678
|
-
_context.next =
|
|
1724
|
+
_context.next = 64;
|
|
1679
1725
|
break;
|
|
1680
|
-
case
|
|
1681
|
-
_context.prev =
|
|
1682
|
-
_context.t1 = _context["catch"](
|
|
1726
|
+
case 61:
|
|
1727
|
+
_context.prev = 61;
|
|
1728
|
+
_context.t1 = _context["catch"](8);
|
|
1683
1729
|
console.error(_context.t1);
|
|
1684
|
-
case
|
|
1730
|
+
case 64:
|
|
1685
1731
|
case "end":
|
|
1686
1732
|
return _context.stop();
|
|
1687
1733
|
}
|
|
1688
|
-
}, _callee, null, [[
|
|
1734
|
+
}, _callee, null, [[8, 61], [45, 52]]);
|
|
1689
1735
|
}));
|
|
1690
1736
|
return function orderBack(_x) {
|
|
1691
1737
|
return _ref2.apply(this, arguments);
|
|
@@ -2082,6 +2128,29 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref7) {
|
|
|
2082
2128
|
form.setFieldsValue(values);
|
|
2083
2129
|
};
|
|
2084
2130
|
|
|
2131
|
+
// wdt商品信息返填
|
|
2132
|
+
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
|
|
2133
|
+
var _templateList$compone3;
|
|
2134
|
+
var templateList = _ref8.templateList,
|
|
2135
|
+
value = _ref8.value,
|
|
2136
|
+
form = _ref8.form;
|
|
2137
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
2138
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
2139
|
+
var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
|
|
2140
|
+
return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType);
|
|
2141
|
+
});
|
|
2142
|
+
if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
|
|
2143
|
+
var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);
|
|
2144
|
+
var orderInfo = wdtOrderTransform({
|
|
2145
|
+
orders: value.selectedRows,
|
|
2146
|
+
shopCode: wdtGoodsValue.shopCode
|
|
2147
|
+
});
|
|
2148
|
+
var values = wdtOrderBackFormValues(orderInfo, {
|
|
2149
|
+
componentDtoList: wdtGoodsComponent
|
|
2150
|
+
});
|
|
2151
|
+
form.setFieldsValue(values);
|
|
2152
|
+
};
|
|
2153
|
+
|
|
2085
2154
|
// 获取映射关系
|
|
2086
2155
|
export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplateDetail(templateDetail) {
|
|
2087
2156
|
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.0",
|
|
3
|
+
"version": "0.23.1-alpha.0",
|
|
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.0",
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "^0.23.0",
|
|
37
|
-
"@kmkf-fe-packages/services-components": "^0.23.0",
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "^0.23.1-alpha.0",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "^0.23.1-alpha.0",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "^0.23.1-alpha.0",
|
|
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": "39fd1618947535a2a9186aa7f29dcd366ae0694a",
|
|
78
78
|
"gitHooks": {
|
|
79
79
|
"pre-commit": "lint-staged"
|
|
80
80
|
}
|