root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zds
2022-11-16 13:43:39 +08:00
parent 0fe2c3c013
commit 50389229cc
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/service/impl/PhysicalMstServiceImpl.java
View File

@@ -1001,8 +1001,8 @@ public class PhysicalMstServiceImpl implements PhysicalMstService {
for (int i = 0; i < dataArr.size(); i++) { for (int i = 0; i < dataArr.size(); i++) {
JSONObject json = dataArr.getJSONObject(i); JSONObject json = dataArr.getJSONObject(i);
JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0); JSONObject jsonPhyMst = phyMstTab.query("inspection_id = '"+json.getString("inspection_id")+"'").uniqueResult(0);
if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99")) { if (StrUtil.equals(jsonPhyMst.getString("bill_status"), "99") && StrUtil.equals(jsonPhyMst.getString("is_effective"), "`99`")) {
throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成"); throw new BadRequestException("此理化报告：" + jsonPhyMst.getString("inspection_code") + "已完成且有效");
} }
// 1.将wms物料id转换成本erp物料id // 1.将wms物料id转换成本erp物料id

6
mes/hd/nladmin-system/src/main/java/org/nl/wms/ql/wql/QL_ERP.wql
View File

@@ -71,15 +71,13 @@
where where
is_effective = '1' is_effective = '1'
AND dr = '0' AND dr = '0'
OPTION 输入.ext_id <> "" OPTION 输入.ext_id <> ""
material_id = 输入.ext_id material_id = 输入.ext_id
ENDOPTION ENDOPTION
OPTION 输入.pcsn <> "" OPTION 输入.pcsn <> ""
pcsn = 输入.pcsn pcsn = 输入.pcsn
ENDOPTION ENDOPTION
order by confirm_time desc
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF
@@ -104,4 +102,4 @@
ENDSELECT ENDSELECT
ENDQUERY ENDQUERY
ENDIF ENDIF

2
mes/qd/src/App.vue
View File

@@ -24,7 +24,7 @@ export default {
this.timmer = setTimeout(() => { this.timmer = setTimeout(() => {
sessionStorage.clear() sessionStorage.clear()
this.logout() this.logout()
}, 1000 * 60 * 15) // 15分钟 https://blog.csdn.net/qq_42345108/article/details/103496456 }, 1000 * 60 * 30) // 30分钟 https://blog.csdn.net/qq_42345108/article/details/103496456
}, },
logout() { logout() {
this.$store.dispatch('LogOut').then(() => { this.$store.dispatch('LogOut').then(() => {