@kmkf-fe-packages/kmkf-work-order-service-component 1.22.2 → 1.22.4
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.
- package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +8 -1
- package/dist/esm/FlowTemplateDetailV2/constant.js +1 -1
- package/dist/esm/common/utils/constant.js +11 -0
- package/dist/esm/common/utils/submitDataTransOldFormat.js +1 -0
- package/dist/esm/common/utils/tools.d.ts +1 -0
- package/dist/esm/common/utils/tools.js +94 -39
- package/dist/esm/common/utils/transformWorkOrderData.js +6 -0
- package/dist/esm/model/servers/api.d.ts +1 -0
- package/dist/esm/model/servers/api.js +8 -0
- package/package.json +5 -5
|
@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
|
|
|
29
29
|
import 'moment/locale/zh-cn';
|
|
30
30
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
31
31
|
// 重复检验不需要展示在顶部的
|
|
32
|
-
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
|
|
32
|
+
INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
|
|
33
33
|
import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
|
|
34
34
|
import { factory } from '@kmkf-fe-packages/services-components';
|
|
35
35
|
import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
|
|
@@ -623,6 +623,13 @@ var FormRender = function FormRender(props, ref) {
|
|
|
623
623
|
form: form
|
|
624
624
|
});
|
|
625
625
|
}
|
|
626
|
+
if (workOrderComponentType === 'KM_SYSTEM_ORDER') {
|
|
627
|
+
kmSystemOrderBackValues({
|
|
628
|
+
templateList: templateDetail,
|
|
629
|
+
value: value,
|
|
630
|
+
form: form
|
|
631
|
+
});
|
|
632
|
+
}
|
|
626
633
|
if (workOrderComponentType === 'WLN_SYSTEM_ORDER') {
|
|
627
634
|
wlnSystemOrderBackValues({
|
|
628
635
|
templateList: templateDetail,
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
// 切换当前店铺时,以下组件字段需要清空
|
|
2
|
-
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER', 'BS_E3_REISSUE_GOODS'];
|
|
2
|
+
export var NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE = ['BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD', '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', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SYSTEM_ORDER', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER', 'BS_E3_REISSUE_GOODS'];
|
|
@@ -33,6 +33,11 @@ export var systemOrderMap = {
|
|
|
33
33
|
ids: 'bsSystemSelectIds',
|
|
34
34
|
order: 'bsSystemShowOrder'
|
|
35
35
|
},
|
|
36
|
+
KM_SYSTEM_ORDER: {
|
|
37
|
+
no: 'kmSystemOrderNo',
|
|
38
|
+
ids: 'kmSystemSelectIds',
|
|
39
|
+
order: 'kmSystemShowOrder'
|
|
40
|
+
},
|
|
36
41
|
WLN_SYSTEM_ORDER: {
|
|
37
42
|
no: 'wlnSystemOrderNo',
|
|
38
43
|
ids: 'wlnSystemSelectIds',
|
|
@@ -211,6 +216,12 @@ export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
|
|
|
211
216
|
order: 'bsSystemShowOrder',
|
|
212
217
|
select: 'billNo'
|
|
213
218
|
},
|
|
219
|
+
KM_SYSTEM_ORDER: {
|
|
220
|
+
no: 'kmSystemOrderNo',
|
|
221
|
+
ids: 'kmSystemSelectIds',
|
|
222
|
+
order: 'kmSystemShowOrder',
|
|
223
|
+
select: 'billNo'
|
|
224
|
+
},
|
|
214
225
|
WLN_SYSTEM_ORDER: {
|
|
215
226
|
no: 'wlnSystemOrderNo',
|
|
216
227
|
ids: 'wlnSystemSelectIds',
|
|
@@ -86,6 +86,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
|
|
|
86
86
|
export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
87
87
|
export declare const bsE3SystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
88
88
|
export declare const wlnSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
89
|
+
export declare const kmSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
89
90
|
export declare const wdtSystemOrderBackValues: ({ templateList, value, form }: any) => void;
|
|
90
91
|
export declare const getMappingConfigByTemplateDetail: (templateDetail: {
|
|
91
92
|
componentDtoList: any;
|
|
@@ -18,9 +18,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
|
|
|
18
18
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
19
19
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
20
20
|
import { get, last, cloneDeep, isEqual, set } from 'lodash';
|
|
21
|
-
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail } from "../../model/servers/api";
|
|
21
|
+
import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail } from "../../model/servers/api";
|
|
22
22
|
import moment from 'moment';
|
|
23
|
-
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, wlnOrderTransform, wdtOrderTransform, filterBsE3Orders, filterWdtOrders, unTransField, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
|
|
23
|
+
import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
|
|
24
24
|
import Monitor from 'kmkf-monitor';
|
|
25
25
|
import { PlatForm } from "../../model/flowTemplateDetail/types";
|
|
26
26
|
import transformWorkOrderData from "./transformWorkOrderData";
|
|
@@ -114,6 +114,11 @@ var systemOrderMap = {
|
|
|
114
114
|
ids: 'bsSystemSelectIds',
|
|
115
115
|
order: 'bsSystemShowOrder'
|
|
116
116
|
},
|
|
117
|
+
KM_SYSTEM_ORDER: {
|
|
118
|
+
no: 'kmSystemOrderNo',
|
|
119
|
+
ids: 'kmSystemSelectIds',
|
|
120
|
+
order: 'kmSystemShowOrder'
|
|
121
|
+
},
|
|
117
122
|
WLN_SYSTEM_ORDER: {
|
|
118
123
|
no: 'wlnSystemOrderNo',
|
|
119
124
|
ids: 'wlnSystemSelectIds',
|
|
@@ -147,7 +152,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
|
|
|
147
152
|
//订单返填
|
|
148
153
|
export var orderBack = /*#__PURE__*/function () {
|
|
149
154
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
|
|
150
|
-
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasBsE3, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, bsInfo, wlnInfo, bsE3Info, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey, cacheOrderInfo, _objectSpread3, _cacheOrderInfo;
|
|
155
|
+
var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasKm, hasWdt, hasBsE3, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _kmOrders$orderDetail, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, paymentUniqueKey, cacheOrderInfo, _objectSpread3, _cacheOrderInfo;
|
|
151
156
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
152
157
|
while (1) switch (_context.prev = _context.next) {
|
|
153
158
|
case 0:
|
|
@@ -156,7 +161,12 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
156
161
|
JOIN_SHOP = shopList.find(function (item) {
|
|
157
162
|
return !item.notJoin && item.shopId == shopId;
|
|
158
163
|
}); //判断是否有百胜组件 有就请求bs订单接口
|
|
159
|
-
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']);
|
|
164
|
+
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订单接口
|
|
165
|
+
// 根据系统订单号反填,所以只要判断是否有系统订单号就行
|
|
166
|
+
hasKm = HasFilterHandle(templateDetail, ['KM_SYSTEM_ORDER'
|
|
167
|
+
// 'KM_SEND_GOOD',
|
|
168
|
+
// 'ITEM_SELECT_THIRD',
|
|
169
|
+
]); //判断是否有旺店通组件 有就请求wdt订单接口
|
|
160
170
|
hasWdt = HasFilterHandle(templateDetail, ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_REISSUE_GOODS'
|
|
161
171
|
// 'WDT_SIGNING_TIME',
|
|
162
172
|
// 'WDT_SEND_TIME',
|
|
@@ -168,17 +178,17 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
168
178
|
// 'WDT_DELIVERY_NO',
|
|
169
179
|
]); // 判断是否有旺店通组件 有就请求bsE3订单接口
|
|
170
180
|
hasBsE3 = HasFilterHandle(templateDetail, ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD']); //判断是否有万里牛组件 有就请求wln订单接口
|
|
171
|
-
hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']);
|
|
172
|
-
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt && !hasBsE3)) {
|
|
173
|
-
_context.next =
|
|
181
|
+
hasWln = HasFilterHandle(templateDetail, ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD']); //如果不是对接店铺且三方erp组件也没有
|
|
182
|
+
if (!(!JOIN_SHOP && !hasBs && !hasWln && !hasWdt && !hasBsE3 && !hasKm)) {
|
|
183
|
+
_context.next = 9;
|
|
174
184
|
break;
|
|
175
185
|
}
|
|
176
186
|
return _context.abrupt("return");
|
|
177
|
-
case
|
|
187
|
+
case 9:
|
|
178
188
|
_ref3 = shopList.find(function (item) {
|
|
179
189
|
return item.shopId == shopId;
|
|
180
190
|
}) || {}, shopSourceStr = _ref3.shopSourceStr, _ref3$thirdUserNick = _ref3.thirdUserNick, thirdUserNick = _ref3$thirdUserNick === void 0 ? '' : _ref3$thirdUserNick;
|
|
181
|
-
_context.prev =
|
|
191
|
+
_context.prev = 10;
|
|
182
192
|
promise = [];
|
|
183
193
|
if (!JOIN_SHOP) {
|
|
184
194
|
promise.push(new Promise(function (resolve) {
|
|
@@ -247,27 +257,33 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
247
257
|
resolve([]);
|
|
248
258
|
}));
|
|
249
259
|
}
|
|
250
|
-
|
|
260
|
+
promise.push(hasKm ? kmOrderDetail({
|
|
261
|
+
tid: order_no
|
|
262
|
+
}) : Promise.resolve([]));
|
|
263
|
+
_context.next = 22;
|
|
251
264
|
return Promise.allSettled(promise);
|
|
252
|
-
case
|
|
265
|
+
case 22:
|
|
253
266
|
_yield$Promise$allSet = _context.sent;
|
|
254
|
-
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet,
|
|
267
|
+
_yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 7);
|
|
255
268
|
data = _yield$Promise$allSet2[0];
|
|
256
269
|
jstOrder = _yield$Promise$allSet2[1];
|
|
257
270
|
bsOrder = _yield$Promise$allSet2[2];
|
|
258
271
|
wlnOrder = _yield$Promise$allSet2[3];
|
|
259
272
|
wdtOrder = _yield$Promise$allSet2[4];
|
|
260
273
|
bsE3Order = _yield$Promise$allSet2[5];
|
|
274
|
+
kmOrder = _yield$Promise$allSet2[6];
|
|
261
275
|
orderInfo = (data === null || data === void 0 ? void 0 : (_data$value = data.value) === null || _data$value === void 0 ? void 0 : _data$value.data) || {};
|
|
262
276
|
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) || [];
|
|
263
277
|
bsOrders = (bsOrder === null || bsOrder === void 0 ? void 0 : (_bsOrder$value = bsOrder.value) === null || _bsOrder$value === void 0 ? void 0 : _bsOrder$value.data) || {};
|
|
264
278
|
wlnOrders = (wlnOrder === null || wlnOrder === void 0 ? void 0 : (_wlnOrder$value = wlnOrder.value) === null || _wlnOrder$value === void 0 ? void 0 : _wlnOrder$value.data) || {};
|
|
265
279
|
wdtOrders = (wdtOrder === null || wdtOrder === void 0 ? void 0 : (_wdtOrder$value = wdtOrder.value) === null || _wdtOrder$value === void 0 ? void 0 : _wdtOrder$value.data) || {};
|
|
266
280
|
bsE3Orders = (bsE3Order === null || bsE3Order === void 0 ? void 0 : (_bsE3Order$value = bsE3Order.value) === null || _bsE3Order$value === void 0 ? void 0 : _bsE3Order$value.data) || {};
|
|
281
|
+
kmOrders = (kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data) || {};
|
|
267
282
|
bsE3Orders.orderList = filterBsE3Orders(bsE3Orders, order_no);
|
|
268
283
|
wdtOrders.trades = filterWdtOrders(wdtOrders, order_no);
|
|
284
|
+
kmOrders.orderDetailDtoList = filterKmOrders(kmOrders, order_no);
|
|
269
285
|
Monitor.automaticReport({
|
|
270
|
-
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))
|
|
286
|
+
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), ",\n bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders), ", km\u4FE1\u606F:").concat(JSON.stringify(kmOrders))
|
|
271
287
|
});
|
|
272
288
|
if (plat !== null && plat !== void 0 && plat.subOrderNo) {
|
|
273
289
|
bsOrders.orders = bsOrders.orders.filter(function (item) {
|
|
@@ -284,6 +300,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
284
300
|
componentList: templateDetail.componentDtoList,
|
|
285
301
|
orderNo: order_no
|
|
286
302
|
}), form);
|
|
303
|
+
kmInfo = kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
|
|
304
|
+
order_no: order_no,
|
|
305
|
+
componentList: templateDetail.componentDtoList
|
|
306
|
+
}), form);
|
|
287
307
|
if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
|
|
288
308
|
bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
|
|
289
309
|
bsGoods: []
|
|
@@ -338,6 +358,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
338
358
|
// wdtInfo.wdtDeliveryNo = [{ deliveryNo: '' }];
|
|
339
359
|
}
|
|
340
360
|
|
|
361
|
+
if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
|
|
362
|
+
kmInfo.kmSendGood = [{
|
|
363
|
+
sendId: '',
|
|
364
|
+
sendName: ''
|
|
365
|
+
}];
|
|
366
|
+
}
|
|
367
|
+
|
|
341
368
|
//获取当前表单字段
|
|
342
369
|
formValue = form.getFieldsValue();
|
|
343
370
|
detail = _objectSpread(_objectSpread({}, orderInfo), {}, {
|
|
@@ -345,7 +372,8 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
345
372
|
bsOrder: bsInfo,
|
|
346
373
|
wlnOrder: wlnInfo,
|
|
347
374
|
wdtOrder: wdtInfo,
|
|
348
|
-
bsE3Order: bsE3Info
|
|
375
|
+
bsE3Order: bsE3Info,
|
|
376
|
+
kmOrder: kmInfo
|
|
349
377
|
}); //抖音数据特殊处理
|
|
350
378
|
if (shopSourceStr === 'FXG') {
|
|
351
379
|
detail = updateDYDetails(detail);
|
|
@@ -356,7 +384,7 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
356
384
|
hasSelectItem = HasErpItemSelectHandle(templateDetail);
|
|
357
385
|
erpPromiseList = [];
|
|
358
386
|
if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
|
|
359
|
-
_context.next =
|
|
387
|
+
_context.next = 71;
|
|
360
388
|
break;
|
|
361
389
|
}
|
|
362
390
|
list = detail['itemList'];
|
|
@@ -374,10 +402,10 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
374
402
|
resolve({});
|
|
375
403
|
});
|
|
376
404
|
});
|
|
377
|
-
_context.prev =
|
|
378
|
-
_context.next =
|
|
405
|
+
_context.prev = 61;
|
|
406
|
+
_context.next = 64;
|
|
379
407
|
return Promise.all(promises);
|
|
380
|
-
case
|
|
408
|
+
case 64:
|
|
381
409
|
erpPromiseList = _context.sent;
|
|
382
410
|
detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
|
|
383
411
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
@@ -387,13 +415,13 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
387
415
|
})
|
|
388
416
|
});
|
|
389
417
|
});
|
|
390
|
-
_context.next =
|
|
418
|
+
_context.next = 71;
|
|
391
419
|
break;
|
|
392
|
-
case
|
|
393
|
-
_context.prev =
|
|
394
|
-
_context.t0 = _context["catch"](
|
|
420
|
+
case 68:
|
|
421
|
+
_context.prev = 68;
|
|
422
|
+
_context.t0 = _context["catch"](61);
|
|
395
423
|
console.error('调用erp获取宝贝编码错误', _context.t0);
|
|
396
|
-
case
|
|
424
|
+
case 71:
|
|
397
425
|
// console.log('detail', detail);
|
|
398
426
|
values = orderBackFormValues({
|
|
399
427
|
detail: detail,
|
|
@@ -425,17 +453,17 @@ export var orderBack = /*#__PURE__*/function () {
|
|
|
425
453
|
// console.log('orderback', values);
|
|
426
454
|
form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
|
|
427
455
|
callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
|
|
428
|
-
_context.next =
|
|
456
|
+
_context.next = 82;
|
|
429
457
|
break;
|
|
430
|
-
case
|
|
431
|
-
_context.prev =
|
|
432
|
-
_context.t1 = _context["catch"](
|
|
458
|
+
case 79:
|
|
459
|
+
_context.prev = 79;
|
|
460
|
+
_context.t1 = _context["catch"](10);
|
|
433
461
|
console.error(_context.t1);
|
|
434
|
-
case
|
|
462
|
+
case 82:
|
|
435
463
|
case "end":
|
|
436
464
|
return _context.stop();
|
|
437
465
|
}
|
|
438
|
-
}, _callee, null, [[
|
|
466
|
+
}, _callee, null, [[10, 79], [61, 68]]);
|
|
439
467
|
}));
|
|
440
468
|
return function orderBack(_x) {
|
|
441
469
|
return _ref2.apply(this, arguments);
|
|
@@ -888,19 +916,46 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
|
|
|
888
916
|
form.setFieldsValue(values);
|
|
889
917
|
};
|
|
890
918
|
|
|
891
|
-
//
|
|
892
|
-
export var
|
|
919
|
+
// km 商品信息返填
|
|
920
|
+
export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
|
|
893
921
|
var _templateList$compone5, _templateList$compone6;
|
|
894
922
|
var templateList = _ref9.templateList,
|
|
895
923
|
value = _ref9.value,
|
|
896
924
|
form = _ref9.form;
|
|
897
925
|
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
898
926
|
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
899
|
-
var
|
|
927
|
+
var kmGoodsComponent = (_templateList$compone5 = templateList.componentDtoList) === null || _templateList$compone5 === void 0 ? void 0 : _templateList$compone5.filter(function (item) {
|
|
928
|
+
return ['KM_SEND_GOOD'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
929
|
+
});
|
|
930
|
+
if (!(kmGoodsComponent !== null && kmGoodsComponent !== void 0 && kmGoodsComponent.length)) return;
|
|
931
|
+
var tIdCom = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.find(function (item) {
|
|
932
|
+
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
933
|
+
});
|
|
934
|
+
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
935
|
+
var orderInfo = kmOrderTransform({
|
|
936
|
+
trades: value.selectedRows,
|
|
937
|
+
componentList: templateList.componentDtoList,
|
|
938
|
+
orderNo: orderNo
|
|
939
|
+
}, form);
|
|
940
|
+
var values = kmOrderBackFormValues(orderInfo, {
|
|
941
|
+
componentDtoList: kmGoodsComponent
|
|
942
|
+
});
|
|
943
|
+
form.setFieldsValue(values);
|
|
944
|
+
};
|
|
945
|
+
|
|
946
|
+
// wdt商品信息返填
|
|
947
|
+
export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10) {
|
|
948
|
+
var _templateList$compone7, _templateList$compone8;
|
|
949
|
+
var templateList = _ref10.templateList,
|
|
950
|
+
value = _ref10.value,
|
|
951
|
+
form = _ref10.form;
|
|
952
|
+
//如果没有选择的值不返填,会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
|
|
953
|
+
if (!(value !== null && value !== void 0 && value.selectedRows)) return;
|
|
954
|
+
var wdtGoodsComponent = (_templateList$compone7 = templateList.componentDtoList) === null || _templateList$compone7 === void 0 ? void 0 : _templateList$compone7.filter(function (item) {
|
|
900
955
|
return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
|
|
901
956
|
});
|
|
902
957
|
if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
|
|
903
|
-
var tIdCom = (_templateList$
|
|
958
|
+
var tIdCom = (_templateList$compone8 = templateList.componentDtoList) === null || _templateList$compone8 === void 0 ? void 0 : _templateList$compone8.find(function (item) {
|
|
904
959
|
return item.workOrderComponentType === 'TRADE_ID_INPUT';
|
|
905
960
|
});
|
|
906
961
|
var orderNo = tIdCom !== null && tIdCom !== void 0 && tIdCom.uniqueKey ? form.getFieldValue(tIdCom.uniqueKey) : null;
|
|
@@ -1061,12 +1116,12 @@ export var transformWorkOrderDetail = function transformWorkOrderDetail(detail)
|
|
|
1061
1116
|
};
|
|
1062
1117
|
|
|
1063
1118
|
// 返填物流轨迹信息
|
|
1064
|
-
export var setLogisticsInfo = function setLogisticsInfo(
|
|
1065
|
-
var logisticsMappingConfig =
|
|
1066
|
-
uniqueKey =
|
|
1067
|
-
workOrderComponentType =
|
|
1068
|
-
value =
|
|
1069
|
-
form =
|
|
1119
|
+
export var setLogisticsInfo = function setLogisticsInfo(_ref11) {
|
|
1120
|
+
var logisticsMappingConfig = _ref11.logisticsMappingConfig,
|
|
1121
|
+
uniqueKey = _ref11.uniqueKey,
|
|
1122
|
+
workOrderComponentType = _ref11.workOrderComponentType,
|
|
1123
|
+
value = _ref11.value,
|
|
1124
|
+
form = _ref11.form;
|
|
1070
1125
|
var values = logisticsMappingConfig.reduce(function (prv, next) {
|
|
1071
1126
|
var logisticsValues = form.getFieldValue(next.uniqueKey);
|
|
1072
1127
|
var componentConfig = next.componentConfig;
|
|
@@ -574,6 +574,11 @@ var processErpSystemOrder = function processErpSystemOrder(getValue) {
|
|
|
574
574
|
ids: 'bsSystemSelectIds',
|
|
575
575
|
order: 'bsSystemShowOrder'
|
|
576
576
|
},
|
|
577
|
+
KM_SYSTEM_ORDER: {
|
|
578
|
+
no: 'kmSystemOrderNo',
|
|
579
|
+
ids: 'kmSystemSelectIds',
|
|
580
|
+
order: 'kmSystemShowOrder'
|
|
581
|
+
},
|
|
577
582
|
WLN_SYSTEM_ORDER: {
|
|
578
583
|
no: 'wlnSystemOrderNo',
|
|
579
584
|
ids: 'wlnSystemSelectIds',
|
|
@@ -769,6 +774,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
|
|
|
769
774
|
BS_RETURN_GOODS: processBsOrWdtReturnGoods,
|
|
770
775
|
WDT_RETURN_GOODS: processBsOrWdtReturnGoods,
|
|
771
776
|
BS_SYSTEM_ORDER: processErpSystemOrder,
|
|
777
|
+
KM_SYSTEM_ORDER: processErpSystemOrder,
|
|
772
778
|
WLN_SYSTEM_ORDER: processErpSystemOrder,
|
|
773
779
|
WDT_SYSTEM_ORDER: processErpSystemOrder,
|
|
774
780
|
BS_E3_SYSTEM_ORDER: processErpSystemOrder,
|
|
@@ -62,6 +62,7 @@ export declare const jstOrderDetail: (data: any) => Promise<any>;
|
|
|
62
62
|
export declare const bsOrderDetail: (data: any) => Promise<any>;
|
|
63
63
|
export declare const wdtOrderDetail: (data: any) => Promise<any>;
|
|
64
64
|
export declare const bsE3OrderDetail: (data: any) => Promise<any>;
|
|
65
|
+
export declare const kmOrderDetail: (data: any) => Promise<serverProps<any>>;
|
|
65
66
|
export declare const getRepeatWorkOrderList: (data: any) => Promise<any>;
|
|
66
67
|
export declare const logisticsInterceptCancel: (data: any) => Promise<any>;
|
|
67
68
|
export declare const queryLogisticsTrack: (data: any) => Promise<any>;
|
|
@@ -397,6 +397,14 @@ export var bsE3OrderDetail = function bsE3OrderDetail(data) {
|
|
|
397
397
|
infoLevel: 'warning'
|
|
398
398
|
});
|
|
399
399
|
};
|
|
400
|
+
export var kmOrderDetail = function kmOrderDetail(data) {
|
|
401
|
+
return request({
|
|
402
|
+
url: '/qy/gdfw/order/kmErpOrderDetail',
|
|
403
|
+
method: 'post',
|
|
404
|
+
data: data,
|
|
405
|
+
infoLevel: 'warning'
|
|
406
|
+
});
|
|
407
|
+
};
|
|
400
408
|
|
|
401
409
|
// 获取重复详情
|
|
402
410
|
export var getRepeatWorkOrderList = function getRepeatWorkOrderList(data) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "1.22.
|
|
3
|
+
"version": "1.22.4",
|
|
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": "1.22.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "1.22.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "1.22.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "1.22.3",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "1.22.3",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "1.22.4",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "49d47932109dffbc867c003ecd9e6ecd5dd76ad0",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|