huojin
/
cqtms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-11-14 13:45:16 +08:00
parent 50363745d2
commit 13607ea10d
1 changed files with 1066 additions and 1071 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/dev/stms/server/service/order/pojo/DefaultImportOrderManager.java
View File

@ -82,6 +82,7 @@ public class DefaultImportOrderManager extends DefaultBaseManager implements Imp
private OrderManager orderManager; private OrderManager orderManager;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
private SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd"); private SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
public DefaultImportOrderManager(ImportOrderPlusManager importOrderPlusManager, BussinessCodeManager codeManager, public DefaultImportOrderManager(ImportOrderPlusManager importOrderPlusManager, BussinessCodeManager codeManager,
TmsOperationHisManager operationHisManager, FeeManager feeManager, OrderManager orderManager) { TmsOperationHisManager operationHisManager, FeeManager feeManager, OrderManager orderManager) {
this.importOrderPlusManager = importOrderPlusManager; this.importOrderPlusManager = importOrderPlusManager;
@ -432,7 +433,6 @@ public class DefaultImportOrderManager extends DefaultBaseManager implements Imp
} }
//提货单位 //提货单位
if(from!=null){
TransLocation fl = null; TransLocation fl = null;
List<TransLocation> fls = this.commonDao.findByQuery("from TransLocation f where f.name=:name and f.disabled=0", List<TransLocation> fls = this.commonDao.findByQuery("from TransLocation f where f.name=:name and f.disabled=0",
new String[]{"name"}, new Object[]{from}); new String[]{"name"}, new Object[]{from});
@ -446,11 +446,10 @@ public class DefaultImportOrderManager extends DefaultBaseManager implements Imp
fromContact.setLinkman(fromlinkman); fromContact.setLinkman(fromlinkman);
if (fromphone != null) if (fromphone != null)
fromContact.setPhone(fromphone); fromContact.setPhone(fromphone);
if(fromphone!=null) if (fromaddress != null)
fromContact.setAddress(fromaddress); fromContact.setAddress(fromaddress);
order.setFromContact(fromContact); order.setFromContact(fromContact);
} }
}
//收货单位 //收货单位
TransLocation tl = null; TransLocation tl = null;
@ -512,8 +511,6 @@ public class DefaultImportOrderManager extends DefaultBaseManager implements Imp
} }
} catch (BiffException e) { } catch (BiffException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
@ -721,8 +718,6 @@ public class DefaultImportOrderManager extends DefaultBaseManager implements Imp
} }
} catch (BiffException e) { } catch (BiffException e) {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();