成衣推送调整

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

@@ -1945,11 +1945,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
 		}
 		if(main.getRecordingCode()!=null){
-			main.setRecordingCode(main.getRecordingCode()+";"+account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+			main.setRecordingCode(main.getRecordingCode()+";"+account+"账套"+tableName+":"+jsonObject.get("U8ReceiptNo"));
 		}else{
-			main.setRecordingCode(account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+			main.setRecordingCode(account+"账套"+tableName+":"+jsonObject.get("U8ReceiptNo"));
 		}
-		return account+"-"+index+"-"+jsonObject.get("ReceiptNo");//账套号-序号-生成的单号
+		return account+"-"+index+"-"+jsonObject.get("U8ReceiptNo");//账套号-序号-生成的单号
 	}
 
 	/**

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

@@ -244,7 +244,7 @@ public class SyPackingListTailoringController {
 		 queryWrapper.eq("a.status","1");//查询已提交数据
 		 //queryWrapper.eq("a.is_Reference","1");//查询已提交数据
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
-			 queryWrapper.like("a.customer",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
+			 queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
 			 queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点

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

@@ -165,6 +165,9 @@
          a.purchase ,
          a.order_type ,
          a.the_factory_price ,
+         a.update_time,
+         a.recording_Error,
+         a.recording_Code,
          a.Push_state ,
          a.status ,
          a.cause ,

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

@@ -1123,7 +1123,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 
 			JSONObject map6=new JSONObject();//销售发票
-			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch","dcreatesystime")));//发票号
+			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch where cvouchtype=27","dcreatesystime")));//发票号
 			map6.put("DDATE",createDate);//发票日期（yyyy-MM-dd）
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称
@@ -1666,11 +1666,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
 		}
 		if(main.getRecordingCode()!=null){
-			main.setRecordingCode(main.getRecordingCode()+";"+account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+			main.setRecordingCode(main.getRecordingCode()+";"+account+"账套"+tableName+":"+jsonObject.get("U8ReceiptNo"));
 		}else{
-			main.setRecordingCode(account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+			main.setRecordingCode(account+"账套"+tableName+":"+jsonObject.get("U8ReceiptNo"));
 		}
-		return account+"-"+index+"-"+jsonObject.get("ReceiptNo");//账套号-序号-生成的单号
+		return account+"-"+index+"-"+jsonObject.get("U8ReceiptNo");//账套号-序号-生成的单号
 	}
 
 	public void getcFree(JSONObject itemMap,Map<String,Object> mapPOPodetails){