@things-factory/worksheet-base 4.3.744 → 4.3.745
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-server/controllers/pos/xilnex-controller.js +24 -5
- package/dist-server/controllers/pos/xilnex-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js +33 -6
- package/dist-server/graphql/resolvers/worksheet/delivery-order-by-worksheet.js.map +1 -1
- package/dist-server/graphql/types/worksheet/contact-point-info.js +1 -0
- package/dist-server/graphql/types/worksheet/contact-point-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet/goods-delivery-note.js +1 -0
- package/dist-server/graphql/types/worksheet/goods-delivery-note.js.map +1 -1
- package/package.json +13 -13
- package/server/controllers/pos/xilnex-controller.ts +26 -5
- package/server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts +34 -12
- package/server/graphql/types/worksheet/contact-point-info.ts +1 -0
- package/server/graphql/types/worksheet/goods-delivery-note.ts +1 -0
|
@@ -44,17 +44,26 @@ class XilnexController extends worksheet_controller_1.WorksheetController {
|
|
|
44
44
|
};
|
|
45
45
|
});
|
|
46
46
|
const orderSourceType = arrivalNotice.orderSourceType;
|
|
47
|
+
// Create minimal context for payload logging
|
|
48
|
+
const context = {
|
|
49
|
+
state: {
|
|
50
|
+
domain: arrivalNotice.domain,
|
|
51
|
+
user: this.user
|
|
52
|
+
}
|
|
53
|
+
};
|
|
47
54
|
switch (orderSourceType) {
|
|
48
55
|
case sales_base_1.ORDER_SOURCE_TYPE.XILNEX_PO:
|
|
49
56
|
await integration_accounting_1.AccountingAPI.createPurchaseReceive(xilnex, {
|
|
50
57
|
arrivalNotice,
|
|
51
|
-
orderProducts: orderProducts
|
|
58
|
+
orderProducts: orderProducts,
|
|
59
|
+
context
|
|
52
60
|
});
|
|
53
61
|
break;
|
|
54
62
|
case sales_base_1.ORDER_SOURCE_TYPE.XILNEX_TRANSFER_NOTE:
|
|
55
63
|
await integration_accounting_1.AccountingAPI.createGoodsReceivedNote(xilnex, {
|
|
56
64
|
arrivalNotice,
|
|
57
|
-
orderProducts: orderProducts
|
|
65
|
+
orderProducts: orderProducts,
|
|
66
|
+
context
|
|
58
67
|
});
|
|
59
68
|
break;
|
|
60
69
|
default:
|
|
@@ -78,21 +87,31 @@ class XilnexController extends worksheet_controller_1.WorksheetController {
|
|
|
78
87
|
sku: worksheetDetail.targetProduct.product.sku
|
|
79
88
|
},
|
|
80
89
|
actualPackQty: wd.actualPackQty,
|
|
81
|
-
unitPrice: worksheetDetail.targetProduct.unitPrice
|
|
90
|
+
unitPrice: worksheetDetail.targetProduct.unitPrice,
|
|
91
|
+
refItemId: worksheetDetail.targetProduct.refItemId
|
|
82
92
|
});
|
|
83
93
|
}));
|
|
84
94
|
const orderSourceType = arrivalNotice.orderSourceType;
|
|
95
|
+
// Create minimal context for payload logging
|
|
96
|
+
const context = {
|
|
97
|
+
state: {
|
|
98
|
+
domain: arrivalNotice.domain,
|
|
99
|
+
user: this.user
|
|
100
|
+
}
|
|
101
|
+
};
|
|
85
102
|
switch (orderSourceType) {
|
|
86
103
|
case sales_base_1.ORDER_SOURCE_TYPE.XILNEX_PO:
|
|
87
104
|
await integration_accounting_1.AccountingAPI.createPurchaseReceive(xilnex, {
|
|
88
105
|
arrivalNotice,
|
|
89
|
-
orderProducts: orderProducts
|
|
106
|
+
orderProducts: orderProducts,
|
|
107
|
+
context
|
|
90
108
|
});
|
|
91
109
|
break;
|
|
92
110
|
case sales_base_1.ORDER_SOURCE_TYPE.XILNEX_TRANSFER_NOTE:
|
|
93
111
|
await integration_accounting_1.AccountingAPI.createGoodsReceivedNote(xilnex, {
|
|
94
112
|
arrivalNotice,
|
|
95
|
-
orderProducts: orderProducts
|
|
113
|
+
orderProducts: orderProducts,
|
|
114
|
+
context
|
|
96
115
|
});
|
|
97
116
|
break;
|
|
98
117
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xilnex-controller.js","sourceRoot":"","sources":["../../../server/controllers/pos/xilnex-controller.ts"],"names":[],"mappings":";;;AAEA,6CAA4C;AAC5C,mFAAkF;AAClF,2DAOmC;AACnC,mEAA0D;AAE1D,6CAAgD;AAChD,kEAA6D;AAE7D,MAAa,gBAAiB,SAAQ,0CAAmB;IACvD,KAAK,CAAC,qBAAqB,CACzB,EAAiB,EACjB,MAAkB,EAClB,eAAuB,EACvB,YAAsB;QAEtB,IAAI;YACF,MAAM,aAAa,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;gBACjF,KAAK,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE;gBAC9B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,iBAAiB,CAAC;aACrD,CAAC,CAAA;YAEF,IAAI,EAAE,GAAG,EAAE;iBACR,aAAa,CAAC,0BAAS,CAAC;iBACxB,kBAAkB,CAAC,IAAI,CAAC;iBACxB,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC;iBAC7B,SAAS,CAAC,gBAAgB,EAAE,WAAW,CAAC;iBACxC,SAAS,CAAC,yBAAyB,EAAE,UAAU,CAAC;iBAChD,SAAS,CAAC,+BAA+B,EAAE,UAAU,CAAC;iBACtD,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC;iBAC/B,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC;iBAC5B,QAAQ,CAAC,yBAAY,EAAE,IAAI,EAAE,yCAAyC,CAAC;iBACvE,KAAK,CAAC,iCAAiC,CAAC;iBACxC,OAAO,CAAC,eAAe,CAAC;iBACxB,UAAU,CAAC,OAAO,CAAC;iBACnB,UAAU,CAAC,aAAa,CAAC;iBACzB,UAAU,CAAC,gBAAgB,CAAC;iBAC5B,aAAa,CAAC;gBACb,YAAY,EAAE,YAAY;aAC3B,CAAC,CAAA;YAEJ,IAAI,QAAQ,GAAQ,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;YACzC,IAAI,aAAa,GAAU,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC7C,OAAO;oBACL,OAAO,EAAE;wBACP,GAAG,EAAE,IAAI,CAAC,UAAU;qBACrB;oBACD,aAAa,EAAE,IAAI,CAAC,QAAQ;oBAC5B,SAAS,EAAE,IAAI,CAAC,QAAQ;oBACxB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,MAAM,eAAe,GAAW,aAAa,CAAC,eAAe,CAAA;YAC7D,QAAQ,eAAe,EAAE;gBACvB,KAAK,8BAAiB,CAAC,SAAS;oBAC9B,MAAM,sCAAa,CAAC,qBAAqB,CAAC,MAAM,EAAE;wBAChD,aAAa;wBACb,aAAa,EAAE,aAAa;
|
|
1
|
+
{"version":3,"file":"xilnex-controller.js","sourceRoot":"","sources":["../../../server/controllers/pos/xilnex-controller.ts"],"names":[],"mappings":";;;AAEA,6CAA4C;AAC5C,mFAAkF;AAClF,2DAOmC;AACnC,mEAA0D;AAE1D,6CAAgD;AAChD,kEAA6D;AAE7D,MAAa,gBAAiB,SAAQ,0CAAmB;IACvD,KAAK,CAAC,qBAAqB,CACzB,EAAiB,EACjB,MAAkB,EAClB,eAAuB,EACvB,YAAsB;QAEtB,IAAI;YACF,MAAM,aAAa,GAAkB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAa,CAAC,CAAC,OAAO,CAAC;gBACjF,KAAK,EAAE,EAAE,EAAE,EAAE,eAAe,EAAE;gBAC9B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,iBAAiB,CAAC;aACrD,CAAC,CAAA;YAEF,IAAI,EAAE,GAAG,EAAE;iBACR,aAAa,CAAC,0BAAS,CAAC;iBACxB,kBAAkB,CAAC,IAAI,CAAC;iBACxB,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC;iBAC7B,SAAS,CAAC,gBAAgB,EAAE,WAAW,CAAC;iBACxC,SAAS,CAAC,yBAAyB,EAAE,UAAU,CAAC;iBAChD,SAAS,CAAC,+BAA+B,EAAE,UAAU,CAAC;iBACtD,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC;iBAC/B,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC;iBAC5B,QAAQ,CAAC,yBAAY,EAAE,IAAI,EAAE,yCAAyC,CAAC;iBACvE,KAAK,CAAC,iCAAiC,CAAC;iBACxC,OAAO,CAAC,eAAe,CAAC;iBACxB,UAAU,CAAC,OAAO,CAAC;iBACnB,UAAU,CAAC,aAAa,CAAC;iBACzB,UAAU,CAAC,gBAAgB,CAAC;iBAC5B,aAAa,CAAC;gBACb,YAAY,EAAE,YAAY;aAC3B,CAAC,CAAA;YAEJ,IAAI,QAAQ,GAAQ,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;YACzC,IAAI,aAAa,GAAU,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gBAC7C,OAAO;oBACL,OAAO,EAAE;wBACP,GAAG,EAAE,IAAI,CAAC,UAAU;qBACrB;oBACD,aAAa,EAAE,IAAI,CAAC,QAAQ;oBAC5B,SAAS,EAAE,IAAI,CAAC,QAAQ;oBACxB,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,MAAM,eAAe,GAAW,aAAa,CAAC,eAAe,CAAA;YAC7D,6CAA6C;YAC7C,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE;oBACL,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB;aACF,CAAA;YAED,QAAQ,eAAe,EAAE;gBACvB,KAAK,8BAAiB,CAAC,SAAS;oBAC9B,MAAM,sCAAa,CAAC,qBAAqB,CAAC,MAAM,EAAE;wBAChD,aAAa;wBACb,aAAa,EAAE,aAAa;wBAC5B,OAAO;qBACR,CAAC,CAAA;oBACF,MAAK;gBAEP,KAAK,8BAAiB,CAAC,oBAAoB;oBACzC,MAAM,sCAAa,CAAC,uBAAuB,CAAC,MAAM,EAAE;wBAClD,aAAa;wBACb,aAAa,EAAE,aAAa;wBAC5B,OAAO;qBACR,CAAC,CAAA;oBACF,MAAK;gBAEP;oBACE,MAAK;aACR;SACF;QAAC,OAAO,KAAK,EAAE;YACd,YAAM,CAAC,KAAK,CAAC,4CAA4C,eAAe,MAAM,KAAK,EAAE,CAAC,CAAA;SACvF;IACH,CAAC;IAED,KAAK,CAAC,kCAAkC,CACtC,EAAiB,EACjB,MAAkB,EAClB,aAA4B,EAC5B,gBAAuB;QAEvB,IAAI;YACF,IAAI,aAAa,GAAU,EAAE,CAAA;YAC7B,MAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;gBAC9B,IAAI,eAAe,GAAoB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,OAAO,CAAC;oBACrF,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAAE;oBACxF,SAAS,EAAE,CAAC,eAAe,EAAE,uBAAuB,CAAC;iBACtD,CAAC,CAAA;gBAEF,aAAa,CAAC,IAAI,CAAC;oBACjB,OAAO,EAAE;wBACP,GAAG,EAAE,eAAe,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG;qBAC/C;oBACD,aAAa,EAAE,EAAE,CAAC,aAAa;oBAC/B,SAAS,EAAE,eAAe,CAAC,aAAa,CAAC,SAAS;oBAClD,SAAS,EAAE,eAAe,CAAC,aAAa,CAAC,SAAS;iBACnD,CAAC,CAAA;YACJ,CAAC,CAAC,CACH,CAAA;YAED,MAAM,eAAe,GAAW,aAAa,CAAC,eAAe,CAAA;YAC7D,6CAA6C;YAC7C,MAAM,OAAO,GAAG;gBACd,KAAK,EAAE;oBACL,MAAM,EAAE,aAAa,CAAC,MAAM;oBAC5B,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB;aACF,CAAA;YAED,QAAQ,eAAe,EAAE;gBACvB,KAAK,8BAAiB,CAAC,SAAS;oBAC9B,MAAM,sCAAa,CAAC,qBAAqB,CAAC,MAAM,EAAE;wBAChD,aAAa;wBACb,aAAa,EAAE,aAAa;wBAC5B,OAAO;qBACR,CAAC,CAAA;oBACF,MAAK;gBAEP,KAAK,8BAAiB,CAAC,oBAAoB;oBACzC,MAAM,sCAAa,CAAC,uBAAuB,CAAC,MAAM,EAAE;wBAClD,aAAa;wBACb,aAAa,EAAE,aAAa;wBAC5B,OAAO;qBACR,CAAC,CAAA;oBACF,MAAK;gBAEP;oBACE,MAAK;aACR;SACF;QAAC,OAAO,KAAK,EAAE;YACd,YAAM,CAAC,KAAK,CAAC,yDAAyD,aAAa,MAAM,KAAK,EAAE,CAAC,CAAA;SAClG;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,EAAiB,EAAE,MAAkB,EAAE,aAAqB;QACrF,IAAI;YACF,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;gBAC3E,KAAK,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE;gBAC5B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,CAAC;aACvE,CAAC,CAAA;YAEF,IAAI,cAAc,GAAoB,WAAW,CAAC,cAAc,CAAA;YAChE,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,KAAK,EAAC,aAAa,EAAC,EAAE;gBACvC,IAAI,EAAE,GAAG,EAAE;qBACR,aAAa,CAAC,2BAAc,CAAC;qBAC7B,kBAAkB,CAAC,IAAI,CAAC;qBACxB,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC;qBACrC,SAAS,CAAC,iCAAiC,EAAE,iBAAiB,CAAC;qBAC/D,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC;qBACjC,KAAK,CAAC,6CAA6C,CAAC;qBACpD,QAAQ,CAAC,8BAA8B,CAAC;qBACxC,QAAQ,CAAC,kCAAkC,CAAC;qBAC5C,OAAO,CAAC,gBAAgB,CAAC;qBACzB,aAAa,CAAC;oBACb,eAAe,EAAE,aAAa,CAAC,EAAE;oBACjC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE;oBAC/B,UAAU,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE;iBACpC,CAAC,CAAA;gBAEJ,IAAI,QAAQ,GAAQ,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;gBACzC,IAAI,aAAa,GAAU,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC7C,OAAO;wBACL,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,UAAU,EAAE,IAAI,CAAC,eAAe;qBACjC,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,MAAM,sCAAa,CAAC,oBAAoB,CAAC,MAAM,EAAE;oBAC/C,WAAW;oBACX,aAAa,EAAE,aAAa;iBAC7B,CAAC,CAAA;YACJ,CAAC,CAAC,CACH,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,YAAM,CAAC,KAAK,CAAC,2CAA2C,aAAa,MAAM,KAAK,EAAE,CAAC,CAAA;SACpF;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,EAAiB,EAAE,MAAkB,EAAE,aAAqB;QAC/E,IAAI;YACF,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;gBAC3E,KAAK,EAAE,EAAE,EAAE,EAAE,aAAa,EAAE;gBAC5B,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,gBAAgB,CAAC;aACvE,CAAC,CAAA;YAEF,IAAI,cAAc,GAAoB,WAAW,CAAC,cAAc,CAAA;YAChE,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,KAAK,EAAC,aAAa,EAAC,EAAE;gBACvC,IAAI,EAAE,GAAG,EAAE;qBACR,aAAa,CAAC,2BAAc,CAAC;qBAC7B,kBAAkB,CAAC,IAAI,CAAC;qBACxB,MAAM,CAAC,gBAAgB,EAAE,WAAW,CAAC;qBACrC,SAAS,CAAC,iCAAiC,EAAE,iBAAiB,CAAC;qBAC/D,QAAQ,CAAC,kBAAkB,EAAE,IAAI,CAAC;qBAClC,KAAK,CAAC,6CAA6C,CAAC;qBACpD,QAAQ,CAAC,8BAA8B,CAAC;qBACxC,QAAQ,CAAC,kCAAkC,CAAC;qBAC5C,OAAO,CAAC,gBAAgB,CAAC;qBACzB,aAAa,CAAC;oBACb,eAAe,EAAE,aAAa,CAAC,EAAE;oBACjC,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE;oBAC/B,UAAU,EAAE,WAAW,CAAC,QAAQ,CAAC,EAAE;iBACpC,CAAC,CAAA;gBAEJ,IAAI,QAAQ,GAAQ,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;gBACzC,IAAI,aAAa,GAAU,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBAC7C,OAAO;wBACL,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,UAAU,EAAE,IAAI,CAAC,eAAe;qBACjC,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,MAAM,sCAAa,CAAC,cAAc,CAAC,MAAM,EAAE;oBACzC,WAAW;oBACX,aAAa,EAAE,aAAa;iBAC7B,CAAC,CAAA;YACJ,CAAC,CAAC,CACH,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,YAAM,CAAC,KAAK,CAAC,qCAAqC,aAAa,MAAM,KAAK,EAAE,CAAC,CAAA;SAC9E;IACH,CAAC;CACF;AAnOD,4CAmOC"}
|
|
@@ -7,7 +7,7 @@ const sales_base_1 = require("@things-factory/sales-base");
|
|
|
7
7
|
const transport_base_1 = require("@things-factory/transport-base");
|
|
8
8
|
exports.deliveryOrderByWorksheetResolver = {
|
|
9
9
|
async deliveryOrderByWorksheet(_, { name }, context) {
|
|
10
|
-
var _a;
|
|
10
|
+
var _a, _b, _c;
|
|
11
11
|
const { domain, tx } = context.state;
|
|
12
12
|
try {
|
|
13
13
|
const foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).findOne({
|
|
@@ -15,7 +15,16 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
15
15
|
domain,
|
|
16
16
|
name
|
|
17
17
|
},
|
|
18
|
-
relations: [
|
|
18
|
+
relations: [
|
|
19
|
+
'domain',
|
|
20
|
+
'bizplace',
|
|
21
|
+
'transportDriver',
|
|
22
|
+
'transportVehicle',
|
|
23
|
+
'releaseGood',
|
|
24
|
+
'releaseGood.deliverTo',
|
|
25
|
+
'creator',
|
|
26
|
+
'updater'
|
|
27
|
+
]
|
|
19
28
|
});
|
|
20
29
|
if (!foundDO)
|
|
21
30
|
throw new Error('Delivery order not found!');
|
|
@@ -49,6 +58,11 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
49
58
|
const partnerContactPoint = await tx.getRepository(biz_base_1.ContactPoint).find({
|
|
50
59
|
where: { domain, bizplace: partnerBiz }
|
|
51
60
|
});
|
|
61
|
+
// Get the release order's deliverTo contact point for business rest day
|
|
62
|
+
let releaseOrderDeliverTo = null;
|
|
63
|
+
if (foundDO.releaseGood && foundDO.releaseGood.deliverTo) {
|
|
64
|
+
releaseOrderDeliverTo = foundDO.releaseGood.deliverTo;
|
|
65
|
+
}
|
|
52
66
|
let foundTransportDriver = { name: '' };
|
|
53
67
|
if (foundDO.transportDriver) {
|
|
54
68
|
foundTransportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
|
|
@@ -64,7 +78,7 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
64
78
|
doStatus: foundDO.status,
|
|
65
79
|
truckNo: foundDO.truckNo,
|
|
66
80
|
bizplace: foundDO.bizplace,
|
|
67
|
-
deliverTo: foundDO.contactPointRefId || '',
|
|
81
|
+
deliverTo: ((_b = (_a = foundDO.releaseGood) === null || _a === void 0 ? void 0 : _a.deliverTo) === null || _b === void 0 ? void 0 : _b.id) || foundDO.contactPointRefId || '',
|
|
68
82
|
deliveryDate: foundDO.deliveryDate || '',
|
|
69
83
|
driverName: foundTransportDriver.name,
|
|
70
84
|
driverCode: foundTransportDriver.driverCode,
|
|
@@ -78,7 +92,7 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
78
92
|
createdDate: foundDO.createdAt.toISOString().split('T')[0],
|
|
79
93
|
isManualDo: foundDO.releaseGood ? false : true,
|
|
80
94
|
attentionTo: foundDO.attentionTo || '',
|
|
81
|
-
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || ((
|
|
95
|
+
releaseGood: Object.assign(Object.assign({}, foundDO.releaseGood), { attentionTo: foundDO.attentionTo || ((_c = foundDO.releaseGood) === null || _c === void 0 ? void 0 : _c.attentionTo), bizplace: partnerBiz }),
|
|
82
96
|
productList: foundOI
|
|
83
97
|
},
|
|
84
98
|
contactPointInfo: partnerContactPoint.map(async (cp) => {
|
|
@@ -88,9 +102,22 @@ exports.deliveryOrderByWorksheetResolver = {
|
|
|
88
102
|
email: cp.email || '',
|
|
89
103
|
fax: cp.fax || '',
|
|
90
104
|
phone: cp.phone || '',
|
|
91
|
-
contactName: cp.name || ''
|
|
105
|
+
contactName: cp.name || '',
|
|
106
|
+
businessRestDay: cp.businessRestDay || ''
|
|
92
107
|
};
|
|
93
|
-
})
|
|
108
|
+
}),
|
|
109
|
+
// Include release order's deliverTo contact point for business rest day validation
|
|
110
|
+
releaseOrderDeliverTo: releaseOrderDeliverTo
|
|
111
|
+
? {
|
|
112
|
+
id: releaseOrderDeliverTo.id,
|
|
113
|
+
address: releaseOrderDeliverTo.address || '',
|
|
114
|
+
email: releaseOrderDeliverTo.email || '',
|
|
115
|
+
fax: releaseOrderDeliverTo.fax || '',
|
|
116
|
+
phone: releaseOrderDeliverTo.phone || '',
|
|
117
|
+
contactName: releaseOrderDeliverTo.name || '',
|
|
118
|
+
businessRestDay: releaseOrderDeliverTo.businessRestDay || ''
|
|
119
|
+
}
|
|
120
|
+
: null
|
|
94
121
|
};
|
|
95
122
|
}
|
|
96
123
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"delivery-order-by-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/delivery-order-by-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contact-point-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/contact-point-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,gBAAgB,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"contact-point-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/contact-point-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,gBAAgB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;CAUlC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"goods-delivery-note.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/goods-delivery-note.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA
|
|
1
|
+
{"version":3,"file":"goods-delivery-note.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/goods-delivery-note.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,iBAAiB,GAAG,IAAA,uBAAG,EAAA;;;;;;CAMnC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.745",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,27 +24,27 @@
|
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
26
|
"@things-factory/auth-base": "^4.3.743",
|
|
27
|
-
"@things-factory/biz-base": "^4.3.
|
|
27
|
+
"@things-factory/biz-base": "^4.3.745",
|
|
28
28
|
"@things-factory/document-template-base": "^4.3.743",
|
|
29
29
|
"@things-factory/id-rule-base": "^4.3.743",
|
|
30
|
-
"@things-factory/integration-accounting": "^4.3.
|
|
30
|
+
"@things-factory/integration-accounting": "^4.3.745",
|
|
31
31
|
"@things-factory/integration-base": "^4.3.743",
|
|
32
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
33
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
34
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
35
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
36
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
37
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
32
|
+
"@things-factory/integration-lmd": "^4.3.745",
|
|
33
|
+
"@things-factory/integration-marketplace": "^4.3.745",
|
|
34
|
+
"@things-factory/integration-powrup": "^4.3.745",
|
|
35
|
+
"@things-factory/integration-sellercraft": "^4.3.745",
|
|
36
|
+
"@things-factory/integration-sftp": "^4.3.745",
|
|
37
|
+
"@things-factory/marketplace-base": "^4.3.745",
|
|
38
38
|
"@things-factory/notification": "^4.3.743",
|
|
39
|
-
"@things-factory/sales-base": "^4.3.
|
|
39
|
+
"@things-factory/sales-base": "^4.3.745",
|
|
40
40
|
"@things-factory/setting-base": "^4.3.743",
|
|
41
41
|
"@things-factory/shell": "^4.3.743",
|
|
42
|
-
"@things-factory/transport-base": "^4.3.
|
|
43
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
42
|
+
"@things-factory/transport-base": "^4.3.745",
|
|
43
|
+
"@things-factory/warehouse-base": "^4.3.745",
|
|
44
44
|
"@things-factory/worksheet-ui": "^4.3.743",
|
|
45
45
|
"jspdf": "2.5.1",
|
|
46
46
|
"puppeteer": "21.0.3",
|
|
47
47
|
"uuid": "^9.0.0"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "89c8b3c8c7ac589d4f547a984c1027a6f509671f"
|
|
50
50
|
}
|
|
@@ -60,18 +60,28 @@ export class XilnexController extends WorksheetController {
|
|
|
60
60
|
})
|
|
61
61
|
|
|
62
62
|
const orderSourceType: string = arrivalNotice.orderSourceType
|
|
63
|
+
// Create minimal context for payload logging
|
|
64
|
+
const context = {
|
|
65
|
+
state: {
|
|
66
|
+
domain: arrivalNotice.domain,
|
|
67
|
+
user: this.user
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
|
|
63
71
|
switch (orderSourceType) {
|
|
64
72
|
case ORDER_SOURCE_TYPE.XILNEX_PO:
|
|
65
73
|
await AccountingAPI.createPurchaseReceive(xilnex, {
|
|
66
74
|
arrivalNotice,
|
|
67
|
-
orderProducts: orderProducts
|
|
75
|
+
orderProducts: orderProducts,
|
|
76
|
+
context
|
|
68
77
|
})
|
|
69
78
|
break
|
|
70
79
|
|
|
71
80
|
case ORDER_SOURCE_TYPE.XILNEX_TRANSFER_NOTE:
|
|
72
81
|
await AccountingAPI.createGoodsReceivedNote(xilnex, {
|
|
73
82
|
arrivalNotice,
|
|
74
|
-
orderProducts: orderProducts
|
|
83
|
+
orderProducts: orderProducts,
|
|
84
|
+
context
|
|
75
85
|
})
|
|
76
86
|
break
|
|
77
87
|
|
|
@@ -103,24 +113,35 @@ export class XilnexController extends WorksheetController {
|
|
|
103
113
|
sku: worksheetDetail.targetProduct.product.sku
|
|
104
114
|
},
|
|
105
115
|
actualPackQty: wd.actualPackQty,
|
|
106
|
-
unitPrice: worksheetDetail.targetProduct.unitPrice
|
|
116
|
+
unitPrice: worksheetDetail.targetProduct.unitPrice,
|
|
117
|
+
refItemId: worksheetDetail.targetProduct.refItemId
|
|
107
118
|
})
|
|
108
119
|
})
|
|
109
120
|
)
|
|
110
121
|
|
|
111
122
|
const orderSourceType: string = arrivalNotice.orderSourceType
|
|
123
|
+
// Create minimal context for payload logging
|
|
124
|
+
const context = {
|
|
125
|
+
state: {
|
|
126
|
+
domain: arrivalNotice.domain,
|
|
127
|
+
user: this.user
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
112
131
|
switch (orderSourceType) {
|
|
113
132
|
case ORDER_SOURCE_TYPE.XILNEX_PO:
|
|
114
133
|
await AccountingAPI.createPurchaseReceive(xilnex, {
|
|
115
134
|
arrivalNotice,
|
|
116
|
-
orderProducts: orderProducts
|
|
135
|
+
orderProducts: orderProducts,
|
|
136
|
+
context
|
|
117
137
|
})
|
|
118
138
|
break
|
|
119
139
|
|
|
120
140
|
case ORDER_SOURCE_TYPE.XILNEX_TRANSFER_NOTE:
|
|
121
141
|
await AccountingAPI.createGoodsReceivedNote(xilnex, {
|
|
122
142
|
arrivalNotice,
|
|
123
|
-
orderProducts: orderProducts
|
|
143
|
+
orderProducts: orderProducts,
|
|
144
|
+
context
|
|
124
145
|
})
|
|
125
146
|
break
|
|
126
147
|
|
|
@@ -1,14 +1,8 @@
|
|
|
1
1
|
import { EntityManager } from 'typeorm'
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
Bizplace,
|
|
5
|
-
ContactPoint
|
|
6
|
-
} from '@things-factory/biz-base'
|
|
3
|
+
import { Bizplace, ContactPoint } from '@things-factory/biz-base'
|
|
7
4
|
import { logger } from '@things-factory/env'
|
|
8
|
-
import {
|
|
9
|
-
DeliveryOrder,
|
|
10
|
-
OrderInventory
|
|
11
|
-
} from '@things-factory/sales-base'
|
|
5
|
+
import { DeliveryOrder, OrderInventory } from '@things-factory/sales-base'
|
|
12
6
|
import { Domain } from '@things-factory/shell'
|
|
13
7
|
import { TransportDriver } from '@things-factory/transport-base'
|
|
14
8
|
|
|
@@ -21,7 +15,16 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
21
15
|
domain,
|
|
22
16
|
name
|
|
23
17
|
},
|
|
24
|
-
relations: [
|
|
18
|
+
relations: [
|
|
19
|
+
'domain',
|
|
20
|
+
'bizplace',
|
|
21
|
+
'transportDriver',
|
|
22
|
+
'transportVehicle',
|
|
23
|
+
'releaseGood',
|
|
24
|
+
'releaseGood.deliverTo',
|
|
25
|
+
'creator',
|
|
26
|
+
'updater'
|
|
27
|
+
]
|
|
25
28
|
})
|
|
26
29
|
|
|
27
30
|
if (!foundDO) throw new Error('Delivery order not found!')
|
|
@@ -59,6 +62,12 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
59
62
|
where: { domain, bizplace: partnerBiz }
|
|
60
63
|
})
|
|
61
64
|
|
|
65
|
+
// Get the release order's deliverTo contact point for business rest day
|
|
66
|
+
let releaseOrderDeliverTo: ContactPoint = null
|
|
67
|
+
if (foundDO.releaseGood && foundDO.releaseGood.deliverTo) {
|
|
68
|
+
releaseOrderDeliverTo = foundDO.releaseGood.deliverTo
|
|
69
|
+
}
|
|
70
|
+
|
|
62
71
|
let foundTransportDriver: TransportDriver = { name: '' }
|
|
63
72
|
if (foundDO.transportDriver) {
|
|
64
73
|
foundTransportDriver = await tx.getRepository(TransportDriver).findOne({
|
|
@@ -75,7 +84,7 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
75
84
|
doStatus: foundDO.status,
|
|
76
85
|
truckNo: foundDO.truckNo,
|
|
77
86
|
bizplace: foundDO.bizplace,
|
|
78
|
-
deliverTo: foundDO.contactPointRefId || '',
|
|
87
|
+
deliverTo: foundDO.releaseGood?.deliverTo?.id || foundDO.contactPointRefId || '',
|
|
79
88
|
deliveryDate: foundDO.deliveryDate || '',
|
|
80
89
|
driverName: foundTransportDriver.name,
|
|
81
90
|
driverCode: foundTransportDriver.driverCode,
|
|
@@ -103,9 +112,22 @@ export const deliveryOrderByWorksheetResolver = {
|
|
|
103
112
|
email: cp.email || '',
|
|
104
113
|
fax: cp.fax || '',
|
|
105
114
|
phone: cp.phone || '',
|
|
106
|
-
contactName: cp.name || ''
|
|
115
|
+
contactName: cp.name || '',
|
|
116
|
+
businessRestDay: cp.businessRestDay || ''
|
|
107
117
|
}
|
|
108
|
-
})
|
|
118
|
+
}),
|
|
119
|
+
// Include release order's deliverTo contact point for business rest day validation
|
|
120
|
+
releaseOrderDeliverTo: releaseOrderDeliverTo
|
|
121
|
+
? {
|
|
122
|
+
id: releaseOrderDeliverTo.id,
|
|
123
|
+
address: releaseOrderDeliverTo.address || '',
|
|
124
|
+
email: releaseOrderDeliverTo.email || '',
|
|
125
|
+
fax: releaseOrderDeliverTo.fax || '',
|
|
126
|
+
phone: releaseOrderDeliverTo.phone || '',
|
|
127
|
+
contactName: releaseOrderDeliverTo.name || '',
|
|
128
|
+
businessRestDay: releaseOrderDeliverTo.businessRestDay || ''
|
|
129
|
+
}
|
|
130
|
+
: null
|
|
109
131
|
}
|
|
110
132
|
} catch (error) {
|
|
111
133
|
logger.error(`delivery-order-by-worksheet:(data:${JSON.stringify({ name, domain })}) ${error} `)
|