@things-factory/worksheet-base 4.3.50 → 4.3.55
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/entities/warehouse-bizplace-onhand-inventory.js +2 -1
- package/dist-server/entities/warehouse-bizplace-onhand-inventory.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-batch-picking.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/picking/activate-batch-picking.js.map +1 -1
- package/package.json +9 -9
- package/server/entities/warehouse-bizplace-onhand-inventory.ts +2 -1
- package/server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts +7 -3
|
@@ -165,7 +165,8 @@ WarehouseBizplaceOnhandInventory = __decorate([
|
|
|
165
165
|
AS src
|
|
166
166
|
inner join domains d on d.id = src."domainId"
|
|
167
167
|
inner join bizplaces b on b.id = src."bizplaceId"
|
|
168
|
-
where src."remainQty"
|
|
168
|
+
where src."remainQty" >= 0
|
|
169
|
+
and src."qty" > 0
|
|
169
170
|
order by src."domainId"
|
|
170
171
|
`
|
|
171
172
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"warehouse-bizplace-onhand-inventory.js","sourceRoot":"","sources":["../../server/entities/warehouse-bizplace-onhand-inventory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;
|
|
1
|
+
{"version":3,"file":"warehouse-bizplace-onhand-inventory.js","sourceRoot":"","sources":["../../server/entities/warehouse-bizplace-onhand-inventory.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgD;AA+GhD,IAAa,gCAAgC,GAA7C,MAAa,gCAAgC;CAoC5C,CAAA;AAlCC;IADC,IAAA,oBAAU,GAAE;;oEACK;AAGlB;IADC,IAAA,oBAAU,GAAE;;sEACO;AAGpB;IADC,IAAA,oBAAU,GAAE;;kEACG;AAGhB;IADC,IAAA,oBAAU,GAAE;;oEACK;AAGlB;IADC,IAAA,oBAAU,GAAE;;qEACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;qEACM;AAGnB;IADC,IAAA,oBAAU,GAAE;;6DACF;AAGX;IADC,IAAA,oBAAU,GAAE;;mEACI;AAGjB;IADC,IAAA,oBAAU,GAAE;;yEACU;AAGvB;IADC,IAAA,oBAAU,GAAE;;mEACI;AAGjB;IADC,IAAA,oBAAU,GAAE;;wEACS;AAGtB;IADC,IAAA,oBAAU,GAAE;;mEACI;AAnCN,gCAAgC;IA7G5C,IAAA,oBAAU,EAAC;QACV,UAAU,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyGX;KACF,CAAC;GAEW,gCAAgC,CAoC5C;AApCY,4EAAgC"}
|
|
@@ -42,8 +42,8 @@ async function activateBatchPicking(tx, domain, user, worksheetNo) {
|
|
|
42
42
|
env_1.logger.error(`picking-worksheet-controller:activateBatchPicking[packageId][refNo: ${releaseGood.refNo}, refNo2: ${releaseGood.refNo2}]: ${JSON.stringify(error)}`);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
const sellercraftCtrl = new
|
|
46
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
45
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
46
|
+
// await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
47
47
|
}));
|
|
48
48
|
}
|
|
49
49
|
// find for any existing marketplace store connections
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts"],"names":[],"mappings":";;;AAGA,qFAA0E;AAC1E,qFAAwF;AACxF,2DAAwD;AAExD,6CAA4C;AAE5C,yDAAgH;AAGnG,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QAC9D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;IAClE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;IAC7E,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAA;IACnD,MAAM,aAAa,GAAW,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;IAEhE,MAAM,WAAW,GAAgB,MAAM,EAAE;SACtC,aAAa,CAAC,qCAAW,CAAC;SAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;IAEnF,IAAI,WAAW,EAAE;QACf,MAAM,YAAY,GAAkB,gBAAgB,CAAC,GAAG,CACtD,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,IAAI,eAAe,CAAC,eAAe,CAAC,WAAW,CAClG,CAAA;QACD,MAAM,kBAAkB,GAAkB,EAAE,CAAA;QAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAA;QACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;gBAC5B,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBAC7B,kBAAkB,CAAC,IAAI,mBAAM,WAAW,EAAG,CAAA;aAC5C;SACF;QAED,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,WAAW,EAAC,EAAE;YACzC,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,KAAI,IAAI,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,CAAC,IAAI,EAAE,KAAI,EAAE,EAAE;gBACzE,IAAI;oBACF,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBAC1F,IAAI,WAAW,GAAG,MAAM,eAAe,CAAC,SAAS,CAAC,WAAW,kCACxD,WAAW,KACd,aAAa,EAAE,WAAW,CAAC,aAAa,IACxC,CAAA;oBAEF,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,EAAE,CAAC,CAAA;oBAExG,WAAW,CAAC,SAAS,GAAG,WAAW,CAAC,SAAS,CAAA;iBAC9C;gBAAC,OAAO,KAAK,EAAE;oBACd,YAAM,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"activate-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts"],"names":[],"mappings":"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"}
|
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.55",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,17 +28,17 @@
|
|
|
28
28
|
"@things-factory/biz-base": "^4.3.47",
|
|
29
29
|
"@things-factory/document-template-base": "^4.3.47",
|
|
30
30
|
"@things-factory/id-rule-base": "^4.3.47",
|
|
31
|
-
"@things-factory/integration-lmd": "^4.3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.3.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.3.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.3.
|
|
31
|
+
"@things-factory/integration-lmd": "^4.3.54",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.3.54",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.3.54",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.3.54",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.3.54",
|
|
36
36
|
"@things-factory/notification": "^4.3.47",
|
|
37
|
-
"@things-factory/sales-base": "^4.3.
|
|
37
|
+
"@things-factory/sales-base": "^4.3.54",
|
|
38
38
|
"@things-factory/setting-base": "^4.3.47",
|
|
39
39
|
"@things-factory/shell": "^4.3.47",
|
|
40
40
|
"@things-factory/transport-base": "^4.3.47",
|
|
41
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
41
|
+
"@things-factory/warehouse-base": "^4.3.54"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "8ccbe0d577033587918d371a7359f10767f9eab1"
|
|
44
44
|
}
|
|
@@ -103,7 +103,8 @@ import { ViewColumn, ViewEntity } from 'typeorm'
|
|
|
103
103
|
AS src
|
|
104
104
|
inner join domains d on d.id = src."domainId"
|
|
105
105
|
inner join bizplaces b on b.id = src."bizplaceId"
|
|
106
|
-
where src."remainQty"
|
|
106
|
+
where src."remainQty" >= 0
|
|
107
|
+
and src."qty" > 0
|
|
107
108
|
order by src."domainId"
|
|
108
109
|
`
|
|
109
110
|
})
|
|
@@ -59,12 +59,16 @@ export async function activateBatchPicking(
|
|
|
59
59
|
|
|
60
60
|
releaseGood.packageId = packageInfo.packageId
|
|
61
61
|
} catch (error) {
|
|
62
|
-
logger.error(
|
|
62
|
+
logger.error(
|
|
63
|
+
`picking-worksheet-controller:activateBatchPicking[packageId][refNo: ${releaseGood.refNo}, refNo2: ${
|
|
64
|
+
releaseGood.refNo2
|
|
65
|
+
}]: ${JSON.stringify(error)}`
|
|
66
|
+
)
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
|
|
66
|
-
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
67
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
70
|
+
// const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
71
|
+
// await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
68
72
|
})
|
|
69
73
|
)
|
|
70
74
|
}
|