面辅料推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -179,7 +179,7 @@
 		AND elements_Id !=''
 		and del_flag=0
 		and submit_Status='1'
-</select>
+	</select>
 
 <!--
 SELECT

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

@@ -1193,7 +1193,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							}
 						}
 					}
-					System.out.println("bigDecimalMap12345\n"+bigDecimalMap);
+					//System.out.println("bigDecimalMap12345\n"+bigDecimalMap);
 				}
 			}
 			for (SyPackingListFabricItem item : main.getSyPackingListFabricItem()){
@@ -1339,20 +1339,22 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				mapItem5.put("CDEFINE33",item.getDeclarationName());//报关品名
 				mapItem6.put("CDEFINE31",item.getDeclarationName());//货物名称
 
+				Order orderIrowno=new Order();
 
 				//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 				if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&orderDataItem.get("iSOsID")!=null){
 					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
+
 					System.out.println("销售订单\n"+orderDataItem2);
-					Order order=new Order();
-					order.setIrowno(orderDataItem2.get("irowno").toString());
-					order.setOrderNumber(orderDataItem2.get("cSOCode").toString());
-					mapSort.put(item.getId(),order);
+					orderIrowno.setIrowno(orderDataItem2.get("irowno").toString());
+					orderIrowno.setOrderNumber(orderDataItem2.get("cSOCode").toString());
+					//mapSort.put(item.getId(),orderIrowno);
 					mapItem3.put("ITAXUNITPRICE",orderDataItem2.get("iTaxUnitPrice"));//原币含税单价（如果传空，取来源单据）（以含税单价为准自动计算相关价格及金额）
 					mapItem3.put("ITAXRATE",orderDataItem2.get("iTaxRate"));//税率（如果传空，取来源单据，无来源单据，取存货档案对应的销项税率）
 					mapItem3.put("SOAUTOIDCOL","ISOSID");//来源单据明细ID对应字段名(如果取销售订单主键，需传固定值ISOSID)
 					mapItem3.put("AUTOID_SO",orderDataItem2.get("iSOsID"));//来源单据明细ID
 					mapt.put("poid", orderDataItem2.get("id"));
+					System.out.println("销售订单子表的行号\t"+orderDataItem2.get("irowno"));
 				}else if(mapt.get("account").equals("103")) {
 					throw new JeecgBootException(mapt.get("account")+"账套,委外订单子表行id"+mapItem.get("AUTOID_PO")+"的isosid为空");
 				}else if(mapt.get("account").equals("102")) {
@@ -1395,6 +1397,31 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					}
 				}
 
+				if(!mapt.get("account").equals("101")){
+					//Order order=mapSort.get(item.getId());
+					String params1="UFDATA_103_2021";//当前数据库
+					String params2="UFDATA_101_2021";//目标数据库
+					String params4="1000000001";//目标账套
+					if(mapt.get("account").equals("102")){//103
+						params1="UFDATA_102_2021";//当前数据库
+					}
+					if(mapt.get("customerCode").equals("T020001")){//101
+						params2="UFDATA_101_2021";
+						params4="1000000001";
+					}
+					if(mapt.get("customerCode").equals("0001")){//102
+						params2="UFDATA_101_2021";
+						params4="1000000002";
+					}
+					//String params1="UFDATA_103_2021";//当前数据库
+					String params3=orderIrowno.getOrderNumber();//销售订单号
+					String params5=orderIrowno.getIrowno();//当前数据库行号
+					String ivouchrowno =syPackingListTailoringMapper.getIvouchrowno(params1,params2,params3,params4,params5);
+					orderIrowno.setIrowno(ivouchrowno);//获取行号
+					System.out.println("销售订单子表的行号\t"+ivouchrowno);
+					mapSort.put(item.getId(),orderIrowno);
+				}
+
 				if(item.getMasterMetering().equals("KG")){//获取净重
 					mapItem.put("IQUANTITY",item.getNetWeight());//数量
 					mapItem3.put("IQUANTITY",item.getNetWeight());//数量
@@ -1906,6 +1933,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				continue;//退出本次循环
 			}
 			List<JSONObject> jsonObjects = JsonChangeUtils.toJSONObject(listMain);
+			System.out.println("数据长度\t"+jsonObjects.size());
 			for (JSONObject json : jsonObjects) {//子表
 				try{
 					SyPackingListFabric sy = JSONObject.toJavaObject(json, SyPackingListFabric.class);

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

@@ -63,4 +63,8 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
     public Map<String,Object> getSyShippingOrder(String id);
 
     public String getCvenName(String cvencode);
+
+    //获取目标行号   参数当前数据库,目标数据库，销售订单号，目标账套号,行号
+    public String getIvouchrowno(@Param("params1") String params1,@Param("params2") String params2,@Param("params3") String params3
+            ,@Param("params4") String params4,@Param("params5") String params5);
 }

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

@@ -276,6 +276,20 @@
         WHERE a.ompo_Id_Item!=b.ompo_Id_Item
     </select>
 
+    <select id="getIvouchrowno"   resultType="java.lang.String">
+        SELECT popos.ivouchrowno FROM
+        ${params1}.dbo.so_sodetails soso
+        LEFT JOIN ${params1}.dbo.HY_DZ_K7_SYNERGISMLOGDID hy
+        ON voucherno = soso.cSOCode
+        AND did = soso.isosid
+        LEFT JOIN ${params2}.dbo.po_podetails popos
+        ON popos.id = hy.predid
+        WHERE soso.cSOCode = #{params3}
+        AND hy.accid =  #{params4}
+        AND soso.iRowNo =  #{params5}
+
+    </select>
+
     <select id="getSyShippingOrder" resultType="java.util.HashMap"  parameterType="java.lang.String">
         select the_final_shipping_date as e1,date_sub(the_final_shipping_date, interval 60 day) e2,
          latest_Date_Of_Shipment e3,the_Documents_State e4

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

@@ -120,4 +120,7 @@ public interface ISyPackingListTailoringService extends IService<SyPackingListTa
 	 */
 	public List<SyPackingListTailoring> queryIds(String[] ids);
 
+	public String getIvouchrowno( String params1, String params2,  String params3
+			,  String params4, String params5);
+
 }

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

@@ -1307,6 +1307,31 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					}
 				}
 
+				if(!mapt.get("account").equals("101")){
+					//Order order=mapSort.get(item.getId());
+					String params1="UFDATA_103_2021";//当前数据库
+					String params2="UFDATA_101_2021";//目标数据库
+					String params4="1000000001";//目标账套
+					if(mapt.get("account").equals("102")){//103
+						params1="UFDATA_102_2021";//当前数据库
+					}
+					if(mapt.get("customerCode").equals("T020001")){//101
+						params2="UFDATA_101_2021";
+						params4="1000000001";
+					}
+					if(mapt.get("customerCode").equals("0001")){//102
+						params2="UFDATA_101_2021";
+						params4="1000000002";
+					}
+					//String params1="UFDATA_103_2021";//当前数据库
+					String params3= (String) map.get("cOrderCode");//销售订单号
+					String params5=mapSort.get(item.getId());//当前数据库行号
+					String ivouchrowno =syPackingListTailoringMapper.getIvouchrowno(params1,params2,params3,params4,params5);
+					//orderIrowno.setIrowno(ivouchrowno);//获取行号
+					System.out.println("销售订单子表的行号\t"+ivouchrowno);
+					mapSort.put(item.getId(),ivouchrowno);
+				}
+
 				mapItem.put("CINVCODE",item.getInventoryCode());//存货编码
 				mapItem.put("IQUANTITY",item.getTotal());//数量
 				//mapItem.put("INUM",orderDataItem.get("inum"));//明细ID（采购订单行ID/委外订单行ID）
@@ -1785,4 +1810,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		//syPackingListTailoring.setSyPackingListTailoringItemList(items);
 		return syPackingListTailorings;
 	}
+
+	@DS("multi-three")
+	public String getIvouchrowno(String params1, String params2, String params3, String params4, String params5) {
+		return syPackingListTailoringMapper.getIvouchrowno(params1,params2,params3,params4,params5);
+	}
 }