huxy 2 лет назад
Родитель
Сommit
b8028220c5

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

@@ -1394,6 +1394,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						getcFree(mapItem6,orderDataItem2);
 						mapItem.put("CBATCHPROPERTY3",item.getRolls());
 						mapItem.put("POAUTOIDCOL","ID");//订单明细ID对应字段名(关联单据类型为采购订单传ID,为采购到货单为Autoid,为委外订单传MODetailsID,为委外到货单为Autoid)
+						mapItem.put("ITAXRATE",orderDataItem.get("iPerTaxRate"));//税率
 						mapItem.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
 						//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
 						//map5.put("CGLTYPE","采购订单");

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

@@ -243,7 +243,7 @@
     </select>
 
     <select id="getOmOrPoItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select  iMoney,iNatUnitPrice, iTaxPrice ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
+        select  iMoney,iNatUnitPrice, iTaxPrice ,iPerTaxRate ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
     </select>
 
     <select id="getSoMain" parameterType="java.lang.String" resultType="java.util.HashMap">

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

@@ -1266,6 +1266,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						getcFree(mapItem6,orderDataItem2);
 						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"));//税率
 						//mapItem.put("IPROCESSCOST",orderDataItem.get("iUnitPrice"));//明细ID(采购订单行ID/委外订单行ID)
 						map5.put("CGLTYPE","入库单");
 						mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)