Browse Source

采购发票接口修改

huxy 2 years ago
parent
commit
e875c13f56

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

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

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

@@ -834,8 +834,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						map5.put("CGLTYPE","采购订单");
 						mapItem5.put("POAUTOIDCOL","ID");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)
 						mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
-						mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
-						mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额
+						mapItem5.put("IORITAXCOST",orderDataItem.get("iTaxPrice"));//原币单价
+						/*mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
+						mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额*/
 					}
 				}else{//委外订单子表数据  顺序---2
 					//第二次怎么获取采购订单的子表id	查询销售订单子表保存行号去绑定上游的账套
@@ -850,8 +851,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					mapItem2.put("ALLCAUTOIDCOL","AllocateId");//订单明细ID对应字段名(固定AllocateId)*/
 					mapItem5.put("POAUTOIDCOL","MODetailsID");//明细ID对应字段名(关联单据类型为采购订单传ID,委外订单传MODetailsID,入库单为Autoid)
 					mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID(采购订单行ID/委外订单行ID)
-					mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
-					mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额
+					mapItem5.put("IORITAXCOST",orderDataItem.get("iTaxPrice"));//原币单价
+					/*mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
+					mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额*/
 				}
 				if(!mapt.get("CVENCODE").equals("one")){//查询供应商表获取编码 	顺序---3
 					String wheCode=syPackingListTailoringMapper.getWhCodeByVenCode(mapt.get("CVENCODE").toString());