汇率调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1388,7 +1388,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				//SYF128-森诺
 				if(!orderData.get("cexchname").equals("人民币")){//不为人民币
 					SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-					String dd = sf1.format(new Date());
+					String dd="";
+					try {
+						dd = sf1.format(sf1.parse(main.getTheFinalShippingDate()));
+					}catch (Exception e){
+						throw new JeecgBootException("最终船期转换异常");
+					}
 					String rateSplit[] = dd.split("-");
 					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
@@ -1650,7 +1655,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						map6.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
 						if(!order.get("cexch_name").equals("人民币")){//不为人民币
 							SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-							String dd = sf1.format(new Date());
+							String dd="";
+							try {
+								dd = sf1.format(sf1.parse(main.getTheFinalShippingDate()));
+							}catch (Exception e){
+								throw new JeecgBootException("最终船期转换异常");
+							}
 							String rateSplit[] = dd.split("-");
 							Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 							map6.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
@@ -2588,7 +2598,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			jsonObject1.put("CEXCH_NAME",order.get("cexch_name"));//币种名称
 			if(!order.get("cexch_name").equals("人民币")){//不为人民币
 				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-				String dd = sf1.format(new Date());
+				String dd="";
+				try {
+					dd = sf1.format(sf1.parse(syPackingListFabric.getTheFinalShippingDate()));
+				}catch (Exception e){
+					throw new JeecgBootException("最终船期转换异常");
+				}
 				String rateSplit[] = dd.split("-");
 				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 				jsonObject1.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -5,6 +5,7 @@ import java.lang.reflect.Array;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -2125,4 +2126,5 @@ public class SyPackingListTailoringController implements Job {
 		}
 	 	 return messages;
 	 }
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1267,7 +1267,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				//SYF128-森诺
 				if(!orderData.get("cexchname").equals("人民币")){//不为人民币
 					SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-					String dd = sf1.format(new Date());
+					String dd="";
+					try {
+						dd = sf1.format(sf1.parse(main.getTheFinalShippingDate()));
+					}catch (Exception e){
+						throw new JeecgBootException("最终船期转换异常");
+					}
 					String rateSplit[] = dd.split("-");
 					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
@@ -1429,7 +1434,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						map6.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
 						if(!order.get("cexch_name").equals("人民币")){//不为人民币
 							SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-							String dd = sf1.format(new Date());
+							String dd="";
+							try {
+								dd = sf1.format(sf1.parse(main.getTheFinalShippingDate()));
+							}catch (Exception e){
+								throw new JeecgBootException("最终船期转换异常");
+							}
 							String rateSplit[] = dd.split("-");
 							Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 							map6.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
@@ -2042,7 +2052,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 			if(!orderData.get("cexchname").equals("人民币")){//不为人民币
 				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-				String dd = sf1.format(new Date());
+				String dd="";
+				try {
+					dd = sf1.format(sf1.parse(syPackingListTailoring.getTheFinalShippingDate()));
+				}catch (Exception e){
+					throw new JeecgBootException("最终船期转换异常");
+				}
 				String rateSplit[] = dd.split("-");
 				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 				jsonObject1.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
@@ -2212,7 +2227,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 			if(!order.get("cexch_name").equals("人民币")){//不为人民币
 				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-				String dd = sf1.format(new Date());
+				String dd="";
+				try {
+					dd = sf1.format(sf1.parse(syPackingListTailoring.getTheFinalShippingDate()));
+				}catch (Exception e){
+					throw new JeecgBootException("最终船期转换异常");
+				}
 				String rateSplit[] = dd.split("-");
 				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
 				jsonObject1.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
@@ -2479,6 +2499,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public Map<String,List<String>> getSuppliers(List<SyPackingListTailoring> listTailorings){
 		Map<String,List<String>> mapLists=new HashMap<>();
 		for (SyPackingListTailoring tailoring : listTailorings){
+			if(tailoring.getRdrecord32Code()==null){
+				continue;
+			}
 			if(mapLists.containsKey(tailoring.getSupplierCode()+"-"+tailoring.getSalesman1())){
 				mapLists.get(tailoring.getSupplierCode()+"-"+tailoring.getSalesman1()).add(tailoring.getRdrecord32Code());
 			}else{