Browse Source

推送发票获取订单单价

huxy 1 year ago
parent
commit
583667c207

+ 8 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringItemMapper.xml

@@ -302,7 +302,8 @@
 		spur_Or_Sub_Order,
 		supplier,
 		memo,
-		unit_price customs_Declaration_Unit_Price,
+		unit_price,
+		customs_Declaration_Unit_Price,
 		master_Metering,
 		(select smail_po from sy_shipping_order_item
 		where tailoring_Fabric_Item_Id=sy_packing_list_tailoring_item.id and del_flag=0 limit 1) small_Po,
@@ -345,7 +346,12 @@
 
 
 	<select id="getInvoice1"  parameterType="java.lang.String" resultType="java.util.HashMap">
-		select * from RdRecords01  where ID in
+
+
+		select iTaxUnitPrice,* from RdRecords01
+		left join SO_SODetails
+		on isodid =SO_SODetails.iSOsID
+		where RdRecords01.ID in
 		(select ID  from RdRecord01
 		where ccode in
 		<foreach collection="codes" item="value" index="index" open="(" separator="," close=")">

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

@@ -2134,7 +2134,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							jsonObject.put("IORITAXCOST",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
 						}
 						if(item.getOmpoAccount().equals("103")&&account.equals("102")){
-							jsonObject.put("IORITAXCOST",item.getUnitPrice().multiply(item.getAccountPrice()));//改成使用报关单价
+							BigDecimal unitPrice=new BigDecimal(map.get("iOriTaxCost").toString());
+							jsonObject.put("IORITAXCOST",unitPrice.multiply(item.getAccountPrice()));//改成使用报关单价*成衣参考单价
 						}
 						getcFree(jsonObject,map);
 						jsonObject.put("CDEFINE28",item.getSmallPo());//小po
@@ -2340,7 +2341,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							jsonObject.put("ITAXUNITPRICE",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
 						}
 						if(item.getOmpoAccount().equals("103")&&account.equals("103")){
-							jsonObject.put("ITAXUNITPRICE",item.getUnitPrice().multiply(item.getAccountPrice()));//改成使用报关单价*成衣参考单价
+							BigDecimal unitPrice=new BigDecimal(map.get("iTaxUnitPrice").toString());
+							jsonObject.put("ITAXUNITPRICE",unitPrice.multiply(item.getAccountPrice()));//改成使用报关单价*成衣参考单价
 						}
 						break;
 					}