@things-factory/sales-base 6.0.3 → 6.0.7

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 (5) hide show
  1. package/dist-server/service/arrival-notice/arrival-notice-mutation.js +14 -14
  2. package/dist-server/service/arrival-notice/arrival-notice-mutation.js.map +1 -1
  3. package/dist-server/tsconfig.tsbuildinfo +1 -1
  4. package/package.json +13 -13
  5. package/server/service/arrival-notice/arrival-notice-mutation.ts +16 -16
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/sales-base",
3
- "version": "6.0.3",
3
+ "version": "6.0.7",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -23,17 +23,17 @@
23
23
  "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
24
24
  },
25
25
  "dependencies": {
26
- "@things-factory/attachment-base": "^6.0.3",
27
- "@things-factory/auth-base": "^6.0.3",
28
- "@things-factory/biz-base": "^6.0.3",
29
- "@things-factory/code-base": "^6.0.3",
30
- "@things-factory/integration-sftp": "^6.0.3",
31
- "@things-factory/notification": "^6.0.3",
32
- "@things-factory/product-base": "^6.0.3",
33
- "@things-factory/setting-base": "^6.0.3",
34
- "@things-factory/shell": "^6.0.1",
35
- "@things-factory/transport-base": "^6.0.3",
36
- "@things-factory/warehouse-base": "^6.0.3"
26
+ "@things-factory/attachment-base": "^6.0.7",
27
+ "@things-factory/auth-base": "^6.0.7",
28
+ "@things-factory/biz-base": "^6.0.7",
29
+ "@things-factory/code-base": "^6.0.7",
30
+ "@things-factory/integration-sftp": "^6.0.7",
31
+ "@things-factory/notification": "^6.0.7",
32
+ "@things-factory/product-base": "^6.0.7",
33
+ "@things-factory/setting-base": "^6.0.7",
34
+ "@things-factory/shell": "^6.0.7",
35
+ "@things-factory/transport-base": "^6.0.7",
36
+ "@things-factory/warehouse-base": "^6.0.7"
37
37
  },
38
- "gitHead": "6d9a3aef103e6d8293bfce285662d15ec9c0d705"
38
+ "gitHead": "5af6d8613bd6eab6feaa69df942ef3ddfae764fe"
39
39
  }
package/server/service/arrival-notice/arrival-notice-mutation.ts CHANGED
@@ -614,16 +614,16 @@ export async function confirmArrivalNoticeFunction(
614
614
  where: { domain: { id: domain.id }, category: 'id-rule', name: 'gan-order-processing' }
615
615
  })
616
616
 
617
- const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
618
- where: {
619
- setting: { id: ganProcessingSetting.id },
620
- domain: { id: domain.id },
621
- partnerDomain: { id: customerBizplace?.domain?.id }
622
- }
623
- })
624
-
625
617
  // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
626
618
  if (ganProcessingSetting) {
619
+ const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
620
+ where: {
621
+ setting: { id: ganProcessingSetting.id },
622
+ domain: { id: domain.id },
623
+ partnerDomain: { id: customerBizplace?.domain?.id }
624
+ }
625
+ })
626
+
627
627
  let setting = !isNaN(partnerGanProcessingSetting?.value)
628
628
  ? partnerGanProcessingSetting?.value
629
629
  : ganProcessingSetting.value
@@ -733,16 +733,16 @@ export async function receiveArrivalNoticeFunction(
733
733
  where: { domain: { id: domain.id }, category: 'id-rule', name: 'gan-order-processing' }
734
734
  })
735
735
 
736
- const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
737
- where: {
738
- setting: { id: ganProcessingSetting.id },
739
- domain: { id: domain.id },
740
- partnerDomain: { id: customerBizplace?.domain?.id }
741
- }
742
- })
743
-
744
736
  // If status of GAN is INTRANSIT then directly to assign warehouse
745
737
  if (ganProcessingSetting) {
738
+ const partnerGanProcessingSetting: PartnerSetting = await tx.getRepository(PartnerSetting).findOne({
739
+ where: {
740
+ setting: { id: ganProcessingSetting.id },
741
+ domain: { id: domain.id },
742
+ partnerDomain: { id: customerBizplace?.domain?.id }
743
+ }
744
+ })
745
+
746
746
  let setting = !isNaN(partnerGanProcessingSetting?.value)
747
747
  ? partnerGanProcessingSetting?.value
748
748
  : ganProcessingSetting.value