diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index cf8c16fa..89f4c1ab 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -345,10 +345,10 @@ end as purchaseStatus, case a.order_type - when '1' then '标准销售' - when '2' then '计划销售' - when '3' then '合同销售' - when '4' then '其他销售' + when '1' then '标准采购' + when '2' then '计划采购' + when '3' then '合同采购' + when '4' then '其他采购' end as orderType1, case a.urgent_order diff --git a/jnpf-java-boot/jnpf-web/package-lock.json b/jnpf-java-boot/jnpf-web/package-lock.json index fdf5cd60..296d5587 100644 --- a/jnpf-java-boot/jnpf-web/package-lock.json +++ b/jnpf-java-boot/jnpf-web/package-lock.json @@ -10726,6 +10726,21 @@ "set-immediate-shim": "~1.0.1" } }, + "katex": { + "version": "0.16.9", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.9.tgz", + "integrity": "sha512-fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==", + "requires": { + "commander": "^8.3.0" + }, + "dependencies": { + "commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==" + } + } + }, "killable": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/killable/-/killable-1.0.1.tgz",