推送调整

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

@@ -1375,7 +1375,7 @@ public class SyPackingListTailoringController implements Job {
 			 try {
 				 String message2="";
 				 String id=syPackingListTailorings.get(i).getId();
-				 SyPackingListTailoring main=syPackingListTailoringService.queryId(id);
+				 SyPackingListTailoring main=syPackingListTailoringService.getById(id);
 				 if(main.getIsReference()==0){
 					 message2="请先做托书再推送";
 				 }
@@ -1660,7 +1660,7 @@ public class SyPackingListTailoringController implements Job {
 				return result;
 			}
 			String message2="";
-			SyPackingListTailoring main=syPackingListTailoringService.queryId(ids);
+			SyPackingListTailoring main=syPackingListTailoringService.getById(ids);
 			if(main.getIsReference()==0){
 				result.setSuccess(false);
 				result.setMessage("请先做托书再推送");

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

@@ -168,6 +168,7 @@
 	    (SELECT declaration_name FROM  sy_declaration_elements WHERE id=a.elements_id) productName,/*英文品名*/
          a.depositary_receipt_no ,
          a.purchase ,
+
          a.order_type ,
          a.the_factory_price ,
          a.update_time,
@@ -201,6 +202,7 @@
          a.item_number ,
          a.size_range ,
          a.customer ,
+         a.memo,
          a.customer_abbreviation ,
          a.container_code ,
          a.container_number ,
@@ -222,6 +224,12 @@
          a.total ,
          a.create_by ,
          a.create_time ,
+         a.recording_Status,
+         a.recording_code,
+         a.recording_Status,
+         a.recording_Error,
+         a.is_tc,
+         a.recording,
          a.total_Net_Weight ,
          a.total_Gross_Weight ,
          a.total_Volume ,

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

@@ -2187,7 +2187,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate());//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2());//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
-			//{cBusType=普通销售, cPayCode=null, cDepCode=TSM01, cSOCode=SYE511-马菲羊-面料, cPersonCode=T0148, cCusCode=T020001, cSTCode=02, cexch_name=美元, iExchRate=6.7428}
 			System.out.println("syPackingListFabric.getSupplierCode()\t"+syPackingListTailoring.getSupplierCode());
 			if(syPackingListTailoring.getSupplierCode()!=null){
 				String	venName=syPackingListTailoringMapper.getCvenName(syPackingListTailoring.getSupplierCode());