采购发票调整

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

@@ -711,25 +711,26 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			boolean bool=true;
 			BigDecimal rollsNum=new BigDecimal("0");
 			for (SyPackingListFabricItem fabricItem : fabricItems){
-				if(fabricItem.getNetWeight()==null||fabricItem.getNetWeight().doubleValue()==0){
-					message+="第"+num+"条提交失败,物料"+fabricItem.getInventoryCode()+"净重合计为0;";
+				if(fabricItem.getNetWeight()==null/*||fabricItem.getNetWeight().doubleValue()==0*/){
+					message+="第"+num+"条提交失败,物料"+fabricItem.getInventoryCode()+"净重为null;";
 					bool=false;
 				}
-				else if(fabricItem.getGrossWeight()==null||fabricItem.getGrossWeight().doubleValue()==0){
-					message+="第"+num+"条提交失败,物料"+fabricItem.getInventoryCode()+"毛重合计为0;";
+				else if(fabricItem.getGrossWeight()==null/*||fabricItem.getGrossWeight().doubleValue()==0*/){
+					message+="第"+num+"条提交失败,物料"+fabricItem.getInventoryCode()+"毛重为null;";
 					bool=false;
 				}
-				if(fabricItem.getRolls()!=null){
-					rollsNum=rollsNum.add(fabricItem.getRolls());
+				if(fabricItem.getRolls()==null){
+					message+="第"+num+"条提交失败,物料"+fabricItem.getInventoryCode()+"箱数(匹数)为null;";
+					bool=false;
 				}
 				if (bool==false){
 					break;
 				}
 			}
-			if(rollsNum.doubleValue()==0){
-				message+="第"+num+"条提交失败,箱数(匹数)合计为0;";
-				bool=false;
-			}
+//			if(rollsNum.doubleValue()==0){
+//				message+="第"+num+"条提交失败,箱数(匹数)合计为0;";
+//				bool=false;
+//			}
 			if (bool){
 				SyPackingListFabric syPackingListFabric=syPackingListFabricMapper.selectById(id);
 				syPackingListFabric.setStatus("1");//提交
@@ -1856,20 +1857,20 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
 				BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
 
-				mapItem5.put("MCPRICE","1");//不自动计算金额
-				//原币
-				mapItem5.put("IORITAXCOST", oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
-				mapItem5.put("IORICOST", oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
-				mapItem5.put("IORIMONEY", oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
-				mapItem5.put("IORISUM", oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币含税金额
-				mapItem5.put("IORITAXPRICE", oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
-
-				//本币
-				mapItem5.put("INATTAXPRICE", oConvertUtils.getString(taxPrice.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币含税单价
-				mapItem5.put("ICOST", oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
-				mapItem5.put("IMONEY", oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币金额
-				mapItem5.put("ITAXPRICE", oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
-				mapItem5.put("ISUM", oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币含税金额
+//				mapItem5.put("MCPRICE","1");//不自动计算金额
+//				//原币
+//				mapItem5.put("IORITAXCOST", oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
+//				mapItem5.put("IORICOST", oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
+//				mapItem5.put("IORIMONEY", oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
+//				mapItem5.put("IORISUM", oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币含税金额
+//				mapItem5.put("IORITAXPRICE", oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
+//
+//				//本币
+//				mapItem5.put("INATTAXPRICE", oConvertUtils.getString(taxPrice.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币含税单价
+//				mapItem5.put("ICOST", oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
+//				mapItem5.put("IMONEY", oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币金额
+//				mapItem5.put("ITAXPRICE", oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
+//				mapItem5.put("ISUM", oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币含税金额
 
 
 				mapItem5.put("CINVCODE",item.getInventoryCode());//存货编码
@@ -2877,17 +2878,17 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
 				BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
 
-				jsonObject.put("MCPRICE","1");//不自动计算金额
-				jsonObject.put("IUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
-				jsonObject.put("ITAXUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
-				jsonObject.put("IMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
-				jsonObject.put("ITAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
-				jsonObject.put("ISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币价税合计
-
-				jsonObject.put("INATUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
-				jsonObject.put("INATMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币无税金额
-				jsonObject.put("INATTAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
-				jsonObject.put("INATSUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币价税合计
+//				jsonObject.put("MCPRICE","1");//不自动计算金额
+//				jsonObject.put("IUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
+//				jsonObject.put("ITAXUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
+//				jsonObject.put("IMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
+//				jsonObject.put("ITAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
+//				jsonObject.put("ISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币价税合计
+//
+//				jsonObject.put("INATUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
+//				jsonObject.put("INATMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币无税金额
+//				jsonObject.put("INATTAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
+//				jsonObject.put("INATSUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币价税合计
 
 				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
 					jsonObject.put("CDEFINE23","千克");//报关单位
@@ -3081,17 +3082,17 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
 				BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
 
-				jsonObject.put("MCPRICE","1");//不自动计算金额
-				jsonObject.put("IUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
-				jsonObject.put("ITAXUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
-				jsonObject.put("IMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
-				jsonObject.put("ITAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
-				jsonObject.put("ISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币价税合计
-
-				jsonObject.put("INATUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
-				jsonObject.put("INATMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币无税金额
-				jsonObject.put("INATTAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
-				jsonObject.put("INATSUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币价税合计
+//				jsonObject.put("MCPRICE","1");//不自动计算金额
+//				jsonObject.put("IUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
+//				jsonObject.put("ITAXUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
+//				jsonObject.put("IMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
+//				jsonObject.put("ITAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
+//				jsonObject.put("ISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币价税合计
+//
+//				jsonObject.put("INATUNITPRICE", org.jeecg.common.util.oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
+//				jsonObject.put("INATMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币无税金额
+//				jsonObject.put("INATTAX", org.jeecg.common.util.oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
+//				jsonObject.put("INATSUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币价税合计
 
 				if(item.getMasterMetering()!=null&&item.getMasterMetering().equals("KG")){
 					jsonObject.put("CDEFINE23","千克");//报关单位
@@ -3279,24 +3280,24 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
 				BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
 
-				jsonObject.put("MCPRICE","1");//不自动计算金额
-				//原币
-				jsonObject.put("IORITAXCOST", org.jeecg.common.util.oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
-				jsonObject.put("IORICOST", org.jeecg.common.util.oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
-				jsonObject.put("IORIMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
-				jsonObject.put("IORISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币含税金额
-				jsonObject.put("IORITAXPRICE", org.jeecg.common.util.oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
-//						System.out.println("taxPrice\t"+taxPrice.setScale(2,RoundingMode.HALF_UP)
-//								+"\tioricost\t"+ioricost.setScale(2,RoundingMode.HALF_UP)
-//								+"\ttotalIoricost\t"+totalIoricost.setScale(2,RoundingMode.HALF_UP)
-//								+"\ttotalPrice\t"+totalPrice.setScale(2,RoundingMode.HALF_UP)
-//								+"\ttaxrate2\t"+taxrate2.setScale(2,RoundingMode.HALF_UP));
-				//本币
-				jsonObject.put("INATTAXPRICE", org.jeecg.common.util.oConvertUtils.getString(taxPrice.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币含税单价
-				jsonObject.put("ICOST", org.jeecg.common.util.oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
-				jsonObject.put("IMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币金额
-				jsonObject.put("ITAXPRICE", org.jeecg.common.util.oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
-				jsonObject.put("ISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币含税金额
+//				jsonObject.put("MCPRICE","1");//不自动计算金额
+//				//原币
+//				jsonObject.put("IORITAXCOST", org.jeecg.common.util.oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
+//				jsonObject.put("IORICOST", org.jeecg.common.util.oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
+//				jsonObject.put("IORIMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
+//				jsonObject.put("IORISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币含税金额
+//				jsonObject.put("IORITAXPRICE", org.jeecg.common.util.oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
+////						System.out.println("taxPrice\t"+taxPrice.setScale(2,RoundingMode.HALF_UP)
+////								+"\tioricost\t"+ioricost.setScale(2,RoundingMode.HALF_UP)
+////								+"\ttotalIoricost\t"+totalIoricost.setScale(2,RoundingMode.HALF_UP)
+////								+"\ttotalPrice\t"+totalPrice.setScale(2,RoundingMode.HALF_UP)
+////								+"\ttaxrate2\t"+taxrate2.setScale(2,RoundingMode.HALF_UP));
+//				//本币
+//				jsonObject.put("INATTAXPRICE", org.jeecg.common.util.oConvertUtils.getString(taxPrice.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币含税单价
+//				jsonObject.put("ICOST", org.jeecg.common.util.oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
+//				jsonObject.put("IMONEY", org.jeecg.common.util.oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币金额
+//				jsonObject.put("ITAXPRICE", org.jeecg.common.util.oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
+//				jsonObject.put("ISUM", org.jeecg.common.util.oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币含税金额
 
 
 				jsonObject.put("CDEFINE23",item.getDeclarationUnit());//报关单位

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

@@ -2268,7 +2268,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			BigDecimal dzUsdMoney=new BigDecimal("0");//单证金额合计
 			BigDecimal u8UsdMoney=new BigDecimal("0");//u8美元金额合计
 			for (SyPackingListTailoringItem item : listTailoringItems){
-				JSONObject  jsonObject=new JSONObject();
+				JSONObject jsonObject=new JSONObject();
 				jsonObject.put("IQUANTITY",item.getTotal());//净重
 				jsonObject.put("size",item.getSize());//尺码
 				jsonObject.put("CINVCODE",item.getInventoryCode());//存货编码
@@ -2277,7 +2277,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				if (istc2!=null&&istc2.equals("1")){
 					item.setMemo("TC证书");
 				}
-				jsonObject.put("CBMEMO",item.getMemo());//备注 IORIMONEY
+				jsonObject.put("CBMEMO",item.getMemo());//备注
 				for (Map<String,Object> map : invoices){
 					if(Double.parseDouble(map.get("iQuantity").toString())==Double.parseDouble(jsonObject.get("IQUANTITY").toString())&&
 					   map.get("cInvCode").toString().equalsIgnoreCase(item.getInventoryCode())&&map.get("cFree2").equals(item.getSize())
@@ -2299,46 +2299,47 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 						BigDecimal u8Price=new BigDecimal(jsonObject.get("IORITAXCOST").toString());
 						dzMoney=dzMoney.add(item.getTotal().multiply(u8Price));//单证合计
 						u8Money=u8Money.add(u8Price.multiply(item.getTotal()).setScale(2, RoundingMode.HALF_UP));//单证合计
+						jsonObject.put("IORIMONEY",item.getTotal().multiply(u8Price).setScale(2, RoundingMode.HALF_UP));//改成使用报关单价*成衣参考单价
 
 
-						BigDecimal total=new BigDecimal(oConvertUtils.getString(item.getTotal()));//数量
-						BigDecimal nflat=new BigDecimal(oConvertUtils.getString(jsonObject1.get("IEXCHRATE")));//汇率
-						BigDecimal taxPrice=new BigDecimal(oConvertUtils.getString(u8Price));//原币含税单价
-						BigDecimal totalPrice=total.multiply(taxPrice).setScale(2,RoundingMode.HALF_UP);//含税单价*入库数量=总价
-						BigDecimal itaxrate=new BigDecimal("1.13");//税率
-						if (account.equals("101")){
-							itaxrate=new BigDecimal("1");//税率
-						}
-						BigDecimal ioricost=taxPrice.divide(itaxrate,4, RoundingMode.HALF_UP);//原币无税单价
-						BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
-						BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
-
-						jsonObject.put("MCPRICE","1");//不自动计算金额
-						//原币
-						jsonObject.put("IORITAXCOST",oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
-						jsonObject.put("IORICOST",oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
-						jsonObject.put("IORIMONEY",oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
-						jsonObject.put("IORISUM",oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币含税金额
-						jsonObject.put("IORITAXPRICE",oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
-//						System.out.println("taxPrice\t"+taxPrice.setScale(2,RoundingMode.HALF_UP)
-//								+"\tioricost\t"+ioricost.setScale(2,RoundingMode.HALF_UP)
-//								+"\ttotalIoricost\t"+totalIoricost.setScale(2,RoundingMode.HALF_UP)
-//								+"\ttotalPrice\t"+totalPrice.setScale(2,RoundingMode.HALF_UP)
-//								+"\ttaxrate2\t"+taxrate2.setScale(2,RoundingMode.HALF_UP));
-						//本币
-						jsonObject.put("INATTAXPRICE",oConvertUtils.getString(taxPrice.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币含税单价
-						jsonObject.put("ICOST",oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
-						jsonObject.put("IMONEY",oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币金额
-						jsonObject.put("ITAXPRICE",oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
-						jsonObject.put("ISUM",oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币含税金额
+//						BigDecimal total=new BigDecimal(oConvertUtils.getString(item.getTotal()));//数量
+//						BigDecimal nflat=new BigDecimal(oConvertUtils.getString(jsonObject1.get("IEXCHRATE")));//汇率
+//						BigDecimal taxPrice=new BigDecimal(oConvertUtils.getString(u8Price));//原币含税单价
+//						BigDecimal totalPrice=total.multiply(taxPrice).setScale(2,RoundingMode.HALF_UP);//含税单价*入库数量=总价
+//						BigDecimal itaxrate=new BigDecimal("1.13");//税率
+//						if (account.equals("101")){
+//							itaxrate=new BigDecimal("1");//税率
+//						}
+//						BigDecimal ioricost=taxPrice.divide(itaxrate,4, RoundingMode.HALF_UP);//原币无税单价
+//						BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
+//						BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
+//
+//						jsonObject.put("MCPRICE","1");//不自动计算金额
+//						//原币
+//						jsonObject.put("IORITAXCOST",oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
+//						jsonObject.put("IORICOST",oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
+//						jsonObject.put("IORIMONEY",oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
+//						jsonObject.put("IORISUM",oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币含税金额
+//						jsonObject.put("IORITAXPRICE",oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
+////						System.out.println("taxPrice\t"+taxPrice.setScale(2,RoundingMode.HALF_UP)
+////								+"\tioricost\t"+ioricost.setScale(2,RoundingMode.HALF_UP)
+////								+"\ttotalIoricost\t"+totalIoricost.setScale(2,RoundingMode.HALF_UP)
+////								+"\ttotalPrice\t"+totalPrice.setScale(2,RoundingMode.HALF_UP)
+////								+"\ttaxrate2\t"+taxrate2.setScale(2,RoundingMode.HALF_UP));
+//						//本币
+//						jsonObject.put("INATTAXPRICE",oConvertUtils.getString(taxPrice.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币含税单价
+//						jsonObject.put("ICOST",oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
+//						jsonObject.put("IMONEY",oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币金额
+//						jsonObject.put("ITAXPRICE",oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
+//						jsonObject.put("ISUM",oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币含税金额
 //						System.out.println("1taxPrice\t"+taxPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)
 //								+"\t1ioricost\t"+ioricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)
 //								+"\t1totalIoricost\t"+totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)
 //								+"\t1totalPrice\t"+totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)
 //								+"\t1taxrate2\t"+taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP));
 
-						u8UsdMoney=u8UsdMoney.add(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP));
-						dzUsdMoney=dzUsdMoney.add(totalIoricost.multiply(nflat));
+//						u8UsdMoney=u8UsdMoney.add(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP));
+//						dzUsdMoney=dzUsdMoney.add(totalIoricost.multiply(nflat));
 //						jsonObject.put("IORIMONEY",item.getTotal().multiply(u8Price).setScale(2, RoundingMode.HALF_UP));//改成使用报关单价*成衣参考单价
 
 
@@ -2351,19 +2352,19 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				jsonObject.put("CDEFINE33",item.getDeclarationName());//存货名称
 				jsonArrays.add(jsonObject);
 			}
-			dzMoney=dzMoney.setScale(2, RoundingMode.HALF_UP);
-			dzUsdMoney=dzUsdMoney.setScale(2, RoundingMode.HALF_UP);
+//			dzMoney=dzMoney.setScale(2, RoundingMode.HALF_UP);
+//			dzUsdMoney=dzUsdMoney.setScale(2, RoundingMode.HALF_UP);
 //			System.out.println("dzMoney\t"+dzMoney);
 //			System.out.println("u8Money\t"+u8Money);
 //			System.out.println("dzUsdMoney\t"+dzUsdMoney);
 //			System.out.println("u8UsdMoney\t"+u8UsdMoney);
-			if(dzMoney.compareTo(u8Money)!=0){
-				BigDecimal dividePrice =dzMoney.subtract(u8Money);
-				BigDecimal ioriMoney=new BigDecimal(jsonArrays.getJSONObject(jsonArrays.size()-1).get("IORIMONEY").toString());
-//				System.out.println("dividePrice\t"+dividePrice);
-//				System.out.println("ioriMoney\t"+ioriMoney);
-				jsonArrays.getJSONObject(jsonArrays.size()-1).put("IORIMONEY",ioriMoney.add(dividePrice));
-			}
+//			if(dzMoney.compareTo(u8Money)!=0){
+//				BigDecimal dividePrice =dzMoney.subtract(u8Money);
+//				BigDecimal ioriMoney=new BigDecimal(jsonArrays.getJSONObject(jsonArrays.size()-1).get("IORIMONEY").toString());
+////				System.out.println("dividePrice\t"+dividePrice);
+////				System.out.println("ioriMoney\t"+ioriMoney);
+//				jsonArrays.getJSONObject(jsonArrays.size()-1).put("IORIMONEY",ioriMoney.add(dividePrice));
+//			}
 //			jsonObject.put("IORIMONEY",item.getUnitPrice());//金额
 			jsonObject1.put("DETAILList",jsonArrays);
 			if (syPackingListTailoring.getOmpoAccount().equals(account) && maps.get("isAhaa").toString().equals("国内") ){//国内托书的初始账套不进行推送
@@ -2555,22 +2556,22 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				if (order.get("iTaxRate")!=null){
 					taxrate=Double.parseDouble(order.get("iTaxRate").toString());
 				}
-				BigDecimal itaxrate=new BigDecimal((100.0+taxrate)/100).setScale(2, RoundingMode.HALF_UP);//税率
-				BigDecimal ioricost=taxPrice.divide(itaxrate,4, RoundingMode.HALF_UP);//原币无税单价
-				BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
-				BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
-
-				jsonObject.put("MCPRICE","1");//不自动计算金额
-				jsonObject.put("IUNITPRICE", oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
-				jsonObject.put("ITAXUNITPRICE",oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
-				jsonObject.put("IMONEY", oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
-				jsonObject.put("ITAX", oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
-				jsonObject.put("ISUM", oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币价税合计
-
-				jsonObject.put("INATUNITPRICE",oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
-				jsonObject.put("INATMONEY",oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币无税金额
-				jsonObject.put("INATTAX",oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
-				jsonObject.put("INATSUM",oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币价税合计
+//				BigDecimal itaxrate=new BigDecimal((100.0+taxrate)/100).setScale(2, RoundingMode.HALF_UP);//税率
+//				BigDecimal ioricost=taxPrice.divide(itaxrate,4, RoundingMode.HALF_UP);//原币无税单价
+//				BigDecimal totalIoricost=totalPrice.divide(itaxrate,2,RoundingMode.HALF_UP);//原币无税金额
+//				BigDecimal taxrate2=totalPrice.subtract(totalIoricost);//税额
+//
+//				jsonObject.put("MCPRICE","1");//不自动计算金额
+//				jsonObject.put("IUNITPRICE", oConvertUtils.getString(ioricost.setScale(4,RoundingMode.HALF_UP)));//原币无税单价
+//				jsonObject.put("ITAXUNITPRICE",oConvertUtils.getString(taxPrice.setScale(4,RoundingMode.HALF_UP)));//原币含税单价
+//				jsonObject.put("IMONEY", oConvertUtils.getString(totalIoricost.setScale(2,RoundingMode.HALF_UP)));//原币无税金额
+//				jsonObject.put("ITAX", oConvertUtils.getString(taxrate2.setScale(2,RoundingMode.HALF_UP)));//原币税额
+//				jsonObject.put("ISUM", oConvertUtils.getString(totalPrice.setScale(2,RoundingMode.HALF_UP)));//原币价税合计
+//
+//				jsonObject.put("INATUNITPRICE",oConvertUtils.getString(ioricost.multiply(nflat).setScale(4,RoundingMode.HALF_UP)));//本币无税单价
+//				jsonObject.put("INATMONEY",oConvertUtils.getString(totalIoricost.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币无税金额
+//				jsonObject.put("INATTAX",oConvertUtils.getString(taxrate2.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币税额
+//				jsonObject.put("INATSUM",oConvertUtils.getString(totalPrice.multiply(nflat).setScale(2,RoundingMode.HALF_UP)));//本币价税合计
 
 
 				//jsonObject.put("CDEFINE23",syPackingListTailoringMapper.getUnit(item.getInventoryCode()));//报关单位