发票推送调整、面辅料报关数量调整

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

@@ -2422,7 +2422,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 										}else{
 											BigDecimal meter=netWeight.multiply(new BigDecimal("100000")).divide(width,2,BigDecimal.ROUND_HALF_UP).divide(gramWeight,2,BigDecimal.ROUND_HALF_UP);//米数
 											sy1.setMeter(meter);//米数
-											sy1.setActualDeclaredQuantity(sy1.getNetWeight());//获取米数
+											sy1.setActualDeclaredQuantity(sy1.getMeter());//获取米数
 										}
 									}else{
 										sy1.setActualDeclaredQuantity(null);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/PushJob.java

@@ -76,8 +76,6 @@ public class PushJob implements Job {
             if(codeMaps.get("error").toString().length()>2){
                 String names=codeMaps.get("error").toString();
                 order.setFailMesage(names.substring(1,names.length()-1));
-            }else{
-
             }
             syShippingOrderMapper.updateById(order);
             //codeMaps.put(order.getId(),message);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/SyPackingListTailoringMapper.java

@@ -68,6 +68,10 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
 
     public String getCvenName2(String cvenname);
 
+    public String getCvenName3(String cvenname);
+
+    public String getCvenName4(String cvenname);
+
     public String getUnit(String cinvCode);
 
     //获取目标行号   参数当前数据库,目标数据库，销售订单号，目标账套号,行号

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -338,6 +338,24 @@
         where cVenAbbName =#{value }
     </select>
 
+    <select id="getCvenName3" parameterType="java.lang.String" resultType="java.lang.String">
+        select cVenName  from Vendor
+        where cVenCode =
+        (select cVenCode from OM_MOMain
+        where ccode=
+        (select cOrderCode from rdrecord01
+        where ccode = #{value }))
+    </select>
+
+    <select id="getCvenName4" parameterType="java.lang.String" resultType="java.lang.String">
+        select cVenName  from Vendor
+        where cVenCode =
+        (select cVenCode from PO_Pomain
+        where cpoid=
+        (select cOrderCode from rdrecord01
+        where ccode = #{value }))
+    </select>
+
     <select id="getUnit" parameterType="java.lang.String" resultType="java.lang.String">
         select cInvDefine2 from Inventory
         where cInvCode=#{value }
@@ -369,6 +387,7 @@
         </foreach>
     </select>
 
+
     <select id="getSoMainCode" parameterType="java.lang.String" resultType="java.util.HashMap">
         select cPersonCode,cDepCode,cBusType,cPayCode,cexch_name,iExchRate,cCusCode,cSOCode,cSTCode,cexch_name,iTaxRate
         from SO_SOMain WHERE  cSOCode=

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

@@ -2026,13 +2026,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2().substring(0,10));//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
+			String	venName=syPackingListTailoringMapper.getCvenName3(syPackingListTailoring.getRdrecord32Code());
+			if (venName==null){
+				venName=syPackingListTailoringMapper.getCvenName4(syPackingListTailoring.getRdrecord32Code());
+			}
+			jsonObject1.put("CDEFINE12",venName);//供应商全称
 			if(account.equals("102")){
-				String	venName=syPackingListTailoringMapper.getCvenName2(syPackingListTailoring.getSupplier());
-				jsonObject1.put("CDEFINE12",venName);//供应商全称
 				jsonObject1.put("IVTID","131606");//模板号
-			}else{
-				String	venName=syPackingListTailoringMapper.getCvenName2(syPackingListTailoring.getSupplier());
-				jsonObject1.put("CDEFINE12",venName);//供应商全称
 			}
 			jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
 			jsonObject1.put("IEXCHRATE",orderData.get("nflat"));//汇率
@@ -2195,7 +2195,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			System.out.println("syPackingListFabric.getSupplierCode()\t"+syPackingListTailoring.getSupplierCode());
 			if(syPackingListTailoring.getSupplierCode()!=null){
 				String	venName=syPackingListTailoringMapper.getCvenName2(syPackingListTailoring.getSupplier());
-				jsonObject1.put("CDEFINE12",venName);//供应商全称
+				//jsonObject1.put("CDEFINE12",venName);//供应商全称
 			}
 			jsonObject1.put("CBUSTYPE",order.get("cBusType"));//业务类型
 			jsonObject1.put("CCUSCODE",order.get("cCusCode"));//客户编码
@@ -2445,26 +2445,26 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return mapLists;
 	}
 
-//	/**
-//	 * 采购发票
-//	 * @param codes,listTailorings
-//	 * @return
-//	 */
-//	public Map<String,List<String>> getSuppliers(List<String> codes,List<SyPackingListTailoring> listTailorings){
-//		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
-//		Map<String,List<String>> mapLists=new HashMap<>();
-//		for (Map<String,Object> map : suppliers){
-//			if(mapLists.containsKey(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString())){
-//				mapLists.get(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString()).add(map.get("ccode").toString());
-//			}else{
-//				List<String> list=new ArrayList<>();
-//				list.add(map.get("ccode").toString());
-//				mapLists.put(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString(),list);
-//			}
-//		}
-//		System.out.println("mapLists\t"+mapLists);
-//		return mapLists;
-//	}
+/*	*//**
+	 * 采购发票
+	 * @param codes,listTailorings
+	 * @return
+	 *//*
+	public Map<String,List<String>> getSuppliers(List<String> codes,List<SyPackingListTailoring> listTailorings){
+		List<Map<String,Object>> suppliers=syPackingListTailoringMapper.getSuppliers("rdrecord01",codes.toArray(new String[codes.size()]));
+		Map<String,List<String>> mapLists=new HashMap<>();
+		for (Map<String,Object> map : suppliers){
+			if(mapLists.containsKey(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString())){
+				mapLists.get(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString()).add(map.get("ccode").toString());
+			}else{
+				List<String> list=new ArrayList<>();
+				list.add(map.get("ccode").toString());
+				mapLists.put(map.get("cVenCode").toString()+"-"+map.get("cPersonCode").toString(),list);
+			}
+		}
+		System.out.println("mapLists\t"+mapLists);
+		return mapLists;
+	}*/
 
 
 	/**