From 100622fee338c300456a764c1fc0846c76d6a6b1 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Wed, 5 Mar 2025 11:44:06 +0800 Subject: [PATCH] no message --- .../customs/pojo/DefaultCustomsRecordManager.java | 12 ++++++++++-- .../origen/customs/maintainCustomsRecordPage.xml | 1 + .../origen/customs/maintainCustomsRecordPage.xml | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java b/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java index 9e8d2fa..2397b9c 100644 --- a/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java +++ b/src/main/java/com/dev/swms/server/service/customs/pojo/DefaultCustomsRecordManager.java @@ -169,10 +169,18 @@ public class DefaultCustomsRecordManager extends DefaultBaseManager implements C } //海关备案 - CustomsRecord customsRecord =null; List CustomsRecords=commonDao.findByQuery(" from CustomsRecord cr where upper(cr.code)=upper(:code) and cr.hsCode=:hsCode and cr.name=:name and cr.country=:country and cr.neworold=:neworold ", - new String[]{"code"},new Object[]{code.trim(),hsCode.trim(),name.trim(),ysc.trim(),neworold}); + new String[]{"code","hsCode","name","country","neworold"},new Object[]{code.trim(),hsCode.trim(),name.trim(),ysc.trim(),neworold}); if(CustomsRecords.size()>0){ + CustomsRecord customsRecord=CustomsRecords.get(0); + customsRecord.setItemNumber(item_Number);//项号 + commonDao.store(customsRecord); + } + + CustomsRecord customsRecord =null; + List CustomsRecordList=commonDao.findByQuery(" from CustomsRecord cr where upper(cr.code)=upper(:code) and cr.neworold=:neworold ", + new String[]{"code","neworold"},new Object[]{code.trim(),neworold}); + if(CustomsRecordList.size()>0){ customsRecord=CustomsRecords.get(0); customsRecord.setItemNumber(item_Number);//项号 customsRecord.setHsCode(hsCode);//HSCODE diff --git a/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml b/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml index 68e0984..d3a209f 100644 --- a/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml +++ b/src/webapp/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml @@ -31,6 +31,7 @@ left join customsRecord.legalSecondUint where 1=1 and customsRecord.noninsuranceTpey='保税' + and customsRecord.neworold=0 and customsRecord.warehouse = #{SESSION_WAREHOUSE} /~customsRecord.code: and upper(customsRecord.code) like upper({customsRecord.code})~/ /~customsRecord.name: and upper(customsRecord.name) like upper({customsRecord.name})~/ diff --git a/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml b/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml index 68e0984..d3a209f 100644 --- a/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml +++ b/target/jjwms/WEB-INF/classes/config/origen/customs/maintainCustomsRecordPage.xml @@ -31,6 +31,7 @@ left join customsRecord.legalSecondUint where 1=1 and customsRecord.noninsuranceTpey='保税' + and customsRecord.neworold=0 and customsRecord.warehouse = #{SESSION_WAREHOUSE} /~customsRecord.code: and upper(customsRecord.code) like upper({customsRecord.code})~/ /~customsRecord.name: and upper(customsRecord.name) like upper({customsRecord.name})~/