面辅料推送

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

@@ -1086,17 +1086,21 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				}
 			}
 			if(orderData!=null){
+				//map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
+				//map5.put("IEXCHRATE",orderData.get("iExchRate"));//IEXCHRATE 汇率
 				map.put("CVENCODE",orderData.get("cvencode"));//供应商编码
 				mapt.put("CVENCODE",orderData.get("cvencode"));//供应商编码
-				//map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
 				map5.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码（如果传空，取来源单据）
-				//map5.put("IEXCHRATE",orderData.get("iExchRate"));//IEXCHRATE 汇率
-				map5.put("CEXCH_NAME",orderData.get("cexch_name"));//CEXCH_NAME 币种名称
-				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-				String dd = sf1.format(new Date());
-				String rateSplit[] = dd.split("-");
-				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
-				map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
+				map5.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
+				map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
+				//SYF128-森诺
+				if(!orderData.get("cexchname").equals("人民币")){//不为人民币
+					SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
+					String dd = sf1.format(new Date());
+					String rateSplit[] = dd.split("-");
+					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
+				}
 			}
 			int num1=1;
 			Map<String,BigDecimal> bigDecimalMap=new HashMap<>();
@@ -1227,6 +1231,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							mapItem2.put("CINVCODE",stringObjectMap.get("cInvCode"));//存货编码（如果来源单据是委外订单，此字段需要传该订单的子件编码）
 							mapItem2.put("IQUANTITY",stringObjectMap.get("iQuantity"));//数量
 							mapItem2.put("CBATCH",item.getDyelotNumber());//批号
+							mapItem2.put("CBATCHPROPERTY2",item.getWidth());//门幅
 							mapItems2.add(mapItem2);
 						}
 					}

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

@@ -911,15 +911,18 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				map.put("CVENCODE",orderData.get("cvencode"));//供应商编码
 				mapt.put("CVENCODE",orderData.get("cvencode"));//供应商编码
 				map5.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码（如果传空，取来源单据）
-				map5.put("CEXCH_NAME",orderData.get("cexch_name"));//CEXCH_NAME 币种名称
-
-				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
-				String dd = sf1.format(new Date());
-				String rateSplit[] = dd.split("-");
-				Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
-				map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
-
+				map5.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
+				map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
+				//SYF128-森诺
+				if(!orderData.get("cexchname").equals("人民币")){//不为人民币
+					SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
+					String dd = sf1.format(new Date());
+					String rateSplit[] = dd.split("-");
+					Map<String, Object> rate= syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
+					map5.put("IEXCHRATE",rate.get("nflat").toString());//汇率（如果传空，接口默认1）cPayCode
+				}
 			}
+			System.out.println("map5\t"+map5);
 			for (SyPackingListTailoringItem item : main.getSyPackingListTailoringItemList()){
 
 				if(item.getTotal()==null||item.getTotal().doubleValue()==0){
@@ -1021,6 +1024,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						map3.put("CBUSTYPE",order.get("cBusType"));//业务类型（普通销售、分期付款）（如果传空，取来源单据）
 						/*map6.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
 						map5.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
+						//map5.put("IEXCHRATE",order.get("iExchRate"));//IEXCHRATE 汇率
+						//map5.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
 						map4.put("CEXCH_NAME",order.get("cexch_name"));//币种名称（如果传空，传来源单据；无来源单据，默认人民币）
 						map3.put("CEXCH_NAME",order.get("cexch_name"));//币种名称*/
 						map6.put("CBUSTYPE",order.get("cBusType"));//业务类型
@@ -1033,11 +1038,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						map6.put("IEXCHRATE",order.get("iExchRate"));//IEXCHRATE 汇率
 						map3.put("IEXCHRATE",order.get("iExchRate"));//IEXCHRATE 汇率
 						map4.put("IEXCHRATE",order.get("iExchRate"));//IEXCHRATE 汇率
-						//map5.put("IEXCHRATE",order.get("iExchRate"));//IEXCHRATE 汇率
 						map.put("CEXCH_NAME",order.get("cexch_name"));//币种名称（如果传空，接口默认人民币）
 						map3.put("CEXCH_NAME",order.get("cexch_name"));//币种名称（如果传空，传来源单据；无来源单据，默认人民币）
 						map4.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
-						//map5.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
 						map6.put("CEXCH_NAME",order.get("cexch_name"));//CEXCH_NAME 币种名称
 					}
 				}
@@ -1095,11 +1098,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 
 		text(mapList,"采购入库单");
+		text(mapList3,"销售发货单");
+		text(mapList5,"采购发票单");
 
-		/*if(true){
+
+		if(true){
 			return null;
 		}
-*/
 		String recording=null;
 		if(main.getRecording()!=null){
 			String[] recordings=main.getRecording().split(",");
@@ -1221,8 +1226,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 		}
 
-		text(mapList3,"销售发货单");
-		text(mapList5,"采购发票单");
 		JSONArray resturn5 = InterfaceConnUtils.doPost(mapList5,"purinvoice_import");//采购发票单
 		recording=result(main,resturn5,"采购发票单",((Map) mapList.get(0)).get("CACCID").toString(),"2");//采购发票单
 		recording(main,recording);