@things-factory/integration-accounting 4.3.166 → 4.3.172

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.
Files changed (4) hide show
  1. package/dist-server/controllers/xilnex/apis/goods-received/create-goods-received-note.js +4 -1
  2. package/dist-server/controllers/xilnex/apis/goods-received/create-goods-received-note.js.map +1 -1
  3. package/package.json +3 -3
  4. package/server/controllers/xilnex/apis/goods-received/create-goods-received-note.ts +5 -1
package/dist-server/controllers/xilnex/apis/goods-received/create-goods-received-note.js CHANGED
@@ -25,7 +25,7 @@ function createGoodsReceivedNote() {
25
25
  });
26
26
  let grn = {
27
27
  receivingDate: curDate,
28
- receiveType: 'Receive',
28
+ receiveType: arrivalNotice.orderSourceType == 'XILNEX_PO' ? 'Receive' : 'TRANSFERRECEIVE',
29
29
  receivedStatus: 'Completed',
30
30
  remark: arrivalNotice.remark || 'NA',
31
31
  outlet: (accountInfo === null || accountInfo === void 0 ? void 0 : accountInfo.outlet) || 'MAIN BRANCH',
@@ -34,6 +34,9 @@ function createGoodsReceivedNote() {
34
34
  invoiceNo: '-',
35
35
  invoiceDate: curDate
36
36
  };
37
+ if (arrivalNotice.orderSourceType == 'XILNEX_TRANSFER_NOTE') {
38
+ grn.refId = [arrivalNotice.refNo];
39
+ }
37
40
  return { payload: { goodsReceive: Object.assign(Object.assign({}, grn), { receivedItems }) } };
38
41
  },
39
42
  normalize(res) {
package/dist-server/controllers/xilnex/apis/goods-received/create-goods-received-note.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"create-goods-received-note.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/goods-received/create-goods-received-note.ts"],"names":[],"mappings":";;;AAAA,SAAgB,uBAAuB;IACrC,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,eAAe;QACrB,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YAC7B,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC5C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,IAAI,qBAAqB,GAAG,CAAC,CAAA;YAC7B,MAAM,OAAO,GAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YAEhD,IAAI,aAAa,GAAQ,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9C,qBAAqB,IAAI,EAAE,CAAC,aAAa,CAAA;gBACzC,OAAO;oBACL,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG;oBACxB,gBAAgB,EAAE,EAAE,CAAC,aAAa;oBAClC,kBAAkB,EAAE,CAAC;oBACrB,QAAQ,EAAE,EAAE;oBACZ,aAAa,EAAE,EAAE;oBACjB,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE,EAAE,CAAC,aAAa;oBAC/B,QAAQ,EAAE,EAAE,CAAC,SAAS;iBACvB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,GAAG,GAAQ;gBACb,aAAa,EAAE,OAAO;gBACtB,WAAW,EAAE,SAAS;gBACtB,cAAc,EAAE,WAAW;gBAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,IAAI,IAAI;gBACpC,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa;gBAC5C,qBAAqB,EAAE,qBAAqB;gBAC5C,QAAQ,EAAE,aAAa,CAAC,KAAK;gBAC7B,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE,OAAO;aACrB,CAAA;YAED,OAAO,EAAE,OAAO,EAAE,EAAE,YAAY,kCAAO,GAAG,KAAE,aAAa,GAAE,EAAE,EAAE,CAAA;QACjE,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA1CD,0DA0CC"}
1
+ {"version":3,"file":"create-goods-received-note.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/goods-received/create-goods-received-note.ts"],"names":[],"mappings":";;;AAAA,SAAgB,uBAAuB;IACrC,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,eAAe;QACrB,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;YAC7B,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC5C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,IAAI,qBAAqB,GAAG,CAAC,CAAA;YAC7B,MAAM,OAAO,GAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YAEhD,IAAI,aAAa,GAAQ,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;gBAC9C,qBAAqB,IAAI,EAAE,CAAC,aAAa,CAAA;gBACzC,OAAO;oBACL,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG;oBACxB,gBAAgB,EAAE,EAAE,CAAC,aAAa;oBAClC,kBAAkB,EAAE,CAAC;oBACrB,QAAQ,EAAE,EAAE;oBACZ,aAAa,EAAE,EAAE;oBACjB,UAAU,EAAE,IAAI;oBAChB,aAAa,EAAE,EAAE,CAAC,aAAa;oBAC/B,QAAQ,EAAE,EAAE,CAAC,SAAS;iBACvB,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,GAAG,GAAQ;gBACb,aAAa,EAAE,OAAO;gBACtB,WAAW,EAAE,aAAa,CAAC,eAAe,IAAI,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB;gBACzF,cAAc,EAAE,WAAW;gBAC3B,MAAM,EAAE,aAAa,CAAC,MAAM,IAAI,IAAI;gBACpC,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa;gBAC5C,qBAAqB,EAAE,qBAAqB;gBAC5C,QAAQ,EAAE,aAAa,CAAC,KAAK;gBAC7B,SAAS,EAAE,GAAG;gBACd,WAAW,EAAE,OAAO;aACrB,CAAA;YAED,IAAI,aAAa,CAAC,eAAe,IAAI,sBAAsB,EAAE;gBAC3D,GAAG,CAAC,KAAK,GAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;aAClC;YAED,OAAO,EAAE,OAAO,EAAE,EAAE,YAAY,kCAAO,GAAG,KAAE,aAAa,GAAE,EAAE,EAAE,CAAA;QACjE,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAA;QACZ,CAAC;KACF,CAAA;AACH,CAAC;AA9CD,0DA8CC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-accounting",
3
- "version": "4.3.166",
3
+ "version": "4.3.172",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -33,7 +33,7 @@
33
33
  "@things-factory/i18n-base": "^4.3.159",
34
34
  "@things-factory/integration-ui": "^4.3.163",
35
35
  "@things-factory/more-ui": "^4.3.159",
36
- "@things-factory/product-base": "^4.3.166",
36
+ "@things-factory/product-base": "^4.3.172",
37
37
  "@things-factory/resource-ui": "^4.3.163",
38
38
  "@things-factory/setting-ui": "^4.3.163",
39
39
  "@things-factory/system-ui": "^4.3.159",
@@ -50,5 +50,5 @@
50
50
  "nock": "^13.0.2",
51
51
  "should": "^13.2.3"
52
52
  },
53
- "gitHead": "d4bb11771262388658225e7101b474a0211c8a1a"
53
+ "gitHead": "92db804f13abc4dc5edd36b3cd874dfa897b22db"
54
54
  }
package/server/controllers/xilnex/apis/goods-received/create-goods-received-note.ts CHANGED
@@ -24,7 +24,7 @@ export function createGoodsReceivedNote() {
24
24
 
25
25
  let grn: any = {
26
26
  receivingDate: curDate,
27
- receiveType: 'Receive',
27
+ receiveType: arrivalNotice.orderSourceType == 'XILNEX_PO' ? 'Receive' : 'TRANSFERRECEIVE',
28
28
  receivedStatus: 'Completed',
29
29
  remark: arrivalNotice.remark || 'NA',
30
30
  outlet: accountInfo?.outlet || 'MAIN BRANCH',
@@ -34,6 +34,10 @@ export function createGoodsReceivedNote() {
34
34
  invoiceDate: curDate
35
35
  }
36
36
 
37
+ if (arrivalNotice.orderSourceType == 'XILNEX_TRANSFER_NOTE') {
38
+ grn.refId = [arrivalNotice.refNo]
39
+ }
40
+
37
41
  return { payload: { goodsReceive: { ...grn, receivedItems } } }
38
42
  },
39
43
  normalize(res) {