From f1b726d853f242c5558239138defcd5d0b1636df Mon Sep 17 00:00:00 2001 From: hjg <hjg@123.com> Date: 星期四, 20 二月 2025 17:24:49 +0800 Subject: [PATCH] erp分单 --- JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java index ec33ed7..8c68758 100644 --- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java +++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java @@ -563,11 +563,13 @@ bsi.setRecompany(wx.getTdmx_shdw()); }else{ bsi.setRecompany( - ConvertTool.covertToCustoms(xstd.getTd_ywdybh()) +// ConvertTool.covertToCustoms(xstd.getTd_ywdybh()) + ConvertTool.covertToCustoms(xstd.getTd_cqNo()) ); } bsi.setReID(""); - bsi.setDecompany(ConvertTool.ncCovertToFactoryName(xstd.getTd_ywdybh())); +// bsi.setDecompany(ConvertTool.ncCovertToFactoryName(xstd.getTd_ywdybh())); + bsi.setDecompany(ConvertTool.ncCovertToFactoryName(xstd.getTd_cqNo())); bsi.setDeID(""); bsi.setFrombatch("ERP绯荤粺"); bsi.setForshowindx(1); @@ -918,7 +920,7 @@ String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n"; String strContent = ""; String contentFormatStr = "%s %s %s %s\r\n"; - List<Map> list = tdmxper.yRZcList("08"); + List<Map> list = tdmxper.kjZcList("08"); int index = 1; for (Map map : list) { String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙� @@ -944,7 +946,7 @@ String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n"; String strContent = ""; String contentFormatStr = "%s %s %s %s\r\n"; - List<Map> list = tdmxper.yRZcList("04"); + List<Map> list = tdmxper.kjZcList("04"); int index = 1; for (Map map : list) { String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙� @@ -1081,7 +1083,7 @@ } @Override - public ObjectResult<Map<String, Object>> getcInfo(String cardID) { + public ObjectResult<Map<String, Object>> getcInfo(String cardID,boolean needRecord) { ObjectResult<Map<String, Object>> orr=new ObjectResult<Map<String,Object>>(); Map<String, Object> rem=new HashMap<String, Object>(); Map<String, Object> mp=this.yktper.getcardinuse(cardID); @@ -1170,7 +1172,8 @@ Nckh nckh = zsjper.getNckhbyCode(fd_xstd.getTd_khbh());// 瀹㈡埛涓嶅瓨鍦ㄧ殑鐗规畩鎯呭喌鏄笉搴旇瀛樺湪鐨勶紝浠ラ槻涓囦竴锛屽姞鍒ょ┖銆� tdm.put("td_khmc",nckh!=null?nckh.getName():""); }else { - String name = ConvertTool.covertToCustoms(fd_xstd.getTd_ywdybh()); +// String name = ConvertTool.covertToCustoms(fd_xstd.getTd_ywdybh()); + String name = ConvertTool.covertToCustoms(fd_xstd.getTd_cqNo()); tdm.put("td_khmc", name); } tdm.put("td_bz",fd_xstd.getTd_bz()); @@ -1197,7 +1200,9 @@ }else { mr.put("firstzxhtime", new Date()); } - this.bsper.updateTaskTime(mr); + if(needRecord) { // 涓簍rue 鍒欐洿鏂扮涓�娆℃壂鍗℃椂闂达紝鍚﹀垯涓嶈褰� + this.bsper.updateTaskTime(mr); + } }else { orr.setCode(1); orr.setErrmsg("鏈壘鍒拌杞﹁褰�"); -- Gitblit v1.9.3