发票调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataController.java

@@ -117,7 +117,7 @@ public class SyOrderDataController extends JeecgController<SyOrderData, ISyOrder
 	 		return result;
 	 	}
 	 	//java.net.URLDecoder.decode(parameter,"UTF-8")
-		 result=syOrderDataService.doQuerySyOrder(plancode,account);
+//		 result=syOrderDataService.doQuerySyOrder(plancode,account);
 		 result=syOrderDataService.doQuerySyOrder(plancode,account);
 		 return result;
 	 }

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

@@ -663,7 +663,7 @@ public class SyPackingListFabricController implements Job {
 			 syPackingListFabricService.updateBatchById(listFabrics3);
 			 codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
 			 codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//推送失败信息
-			 if(errors.size()==0){
+			 if(errors.size()==0||errors.indexOf("结算单")>-1){
 				 codeMaps.put("time_Stuta",2);//成功
 			 }
 		 }catch (Exception e){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -2276,7 +2276,7 @@ public class SyPackingListTailoringController implements Job {
 			log.info("listTailorings\n"+listTailorings);
 			codeMaps.put("message",msgs.stream().distinct().collect(Collectors.toList()));//推送成功消息
 			codeMaps.put("error",errors.stream().distinct().collect(Collectors.toList()));//推送失败信息
-			if(errors.size()==0){
+			if(errors.size()==0||errors.indexOf("结算单")>-1){
 				codeMaps.put("time_Stuta",2);//成功
 			}
 		}catch (Exception e){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/PushJob.java

@@ -102,6 +102,9 @@ public class PushJob implements Job {
                 if(codeMaps.get("error").toString().length()>2){
                     String names=codeMaps.get("error").toString();
                     order.setFailMesage(names.substring(1,names.length()-1));
+                    if (names.indexOf("结算单")>-1){
+                        order.setTimeStuta(2);
+                    }
                 }
                 syShippingOrderMapper.updateById(order);
             }

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

@@ -2373,10 +2373,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			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);
+				System.out.println("dividePrice\t"+dividePrice);
+				System.out.println("ioriMoney\t"+ioriMoney);
 				jsonArrays.getJSONObject(jsonArrays.size()-1).put("MCPRICE","1");//不自动计算金额
 				jsonArrays.getJSONObject(jsonArrays.size()-1).put("IORIMONEY",ioriMoney.add(dividePrice));
+				jsonArrays.getJSONObject(jsonArrays.size()-1).put("IORISUM",ioriMoney.add(dividePrice));
 			}
 //			jsonObject.put("IORIMONEY",item.getUnitPrice());//金额
 			jsonObject1.put("DETAILList",jsonArrays);