销售发票税率和面辅料拉取u8判断

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

@@ -2199,6 +2199,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						sy1.setGroupId(oConvertUtils.getId());
 						QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
 						queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
+						queryWrapper2.isNotNull("elements_Id");
+						//queryWrapper2.orderByDesc("update_time");
 						queryWrapper2.last("limit 1");
 						SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
 						if (syShippingDetailsItem != null) {

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

@@ -251,7 +251,7 @@
     </select>
 
     <select id="getSoMainItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select iTaxUnitPrice,iTaxRate,irowno,AutoID,id,iSOsID ,cSOCode   from SO_SODetails where iSOsID=#{id}
+        select iTaxUnitPrice,cast(iTaxRate as decimal(10,3)) iTaxRate,irowno,AutoID,id,iSOsID ,cSOCode   from SO_SODetails where iSOsID=#{id}
     </select>
 
     <select id="getOrderDataId" parameterType="java.lang.String" resultType="java.lang.String">

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

@@ -1267,6 +1267,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID，为采购到货单为Autoid，为委外订单传MODetailsID，为委外到货单为Autoid)
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
 						mapItem.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
+						map.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
 						//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID（采购订单行ID/委外订单行ID）
 						map5.put("CGLTYPE","入库单");
 						mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
@@ -1339,8 +1340,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				mapItem4.put("CDEFINE33",item.getDeclarationName());//报关品名
 				mapItem5.put("CDEFINE23", item.getDeclarationUnit());//报关单位
 				mapItem5.put("CDEFINE33",item.getDeclarationName());//报关品名
-				//mapItem6.put("CDEFINE23", item.getDeclarationUnit());//报关单位
-				//mapItem6.put("CDEFINE33",item.getDeclarationName());//报关品名
+				mapItem6.put("CDEFINE23", item.getDeclarationUnit());//报关单位
+				mapItem6.put("CDEFINE33",item.getDeclarationName());//报关品名
 
 
 				if(!mapt.get("poid").equals("one")){//销售订单