fix
This commit is contained in:
parent
b96b06cc0a
commit
174be3a53a
1 changed files with 3 additions and 2 deletions
|
|
@ -3041,7 +3041,7 @@ export class CommandController extends Controller {
|
||||||
const orgRevision = await this.orgRevisionRepo.findOne({
|
const orgRevision = await this.orgRevisionRepo.findOne({
|
||||||
where: { id: posMasters[0].orgRevisionId }
|
where: { id: posMasters[0].orgRevisionId }
|
||||||
});
|
});
|
||||||
if (orgRevision != null) {
|
if (orgRevision != null && orgRevision.isLock == false) {
|
||||||
await this.orgRevisionRepo.update(orgRevision.id, {
|
await this.orgRevisionRepo.update(orgRevision.id, {
|
||||||
isLock: true,
|
isLock: true,
|
||||||
});
|
});
|
||||||
|
|
@ -3547,7 +3547,8 @@ export class CommandController extends Controller {
|
||||||
where: { id: revisionId },
|
where: { id: revisionId },
|
||||||
relations: ["posMasters"]
|
relations: ["posMasters"]
|
||||||
});
|
});
|
||||||
if (orgRevision != null && !orgRevision?.posMasters.filter(x => x.statusReport === "REPORT")
|
if (orgRevision != null && !["REPORT"].includes(
|
||||||
|
orgRevision.posMasters.find(x => x.statusReport === "REPORT")?.statusReport || "")
|
||||||
) {
|
) {
|
||||||
await this.orgRevisionRepo.update(orgRevision.id, {
|
await this.orgRevisionRepo.update(orgRevision.id, {
|
||||||
isLock: false,
|
isLock: false,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue