单证调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -628,10 +628,10 @@ public class SyPackingListFabricController implements Job {
 			 List<String> errors=new ArrayList<>();
 			 for (SyPackingListFabric fabric : listFabrics1){
 				 if(fabric.getSaleInvoiceError()!=null&&fabric.getSaleInvoiceError().length()>1){
+					 fabric.setTimeStuta(3);
 					 if(fabric.getSaleInvoiceError().indexOf("结算单")>-1){
 						 fabric.setTimeStuta(2);
 					 }
-					 fabric.setTimeStuta(3);
 					 errors.add(fabric.getSaleInvoiceError());
 				 }else{
 					 fabric.setTimeStuta(2);

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

@@ -3383,22 +3383,22 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 //				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)));//原币税额
+				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("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());//报关单位