发票推送取供应商全称、面辅料导入调整

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

@@ -758,7 +758,7 @@ public class SyPackingListFabricController implements Job {
 				 for (int i=0;i<row.getLastCellNum();i++){
 					 Cell cell=row.getCell(i);
 					 if(i<18&&i>14){
-						 if(cell==null||cell.equals("")||cell.toString().length()<1){
+						 if(cell==null||cell.equals("")){
 							 throw new JeecgBootException("请填写第"+(x+1)+"行里的"+sheet.getRow(3).getCell(i));
 						 }
 					 }
@@ -826,12 +826,12 @@ public class SyPackingListFabricController implements Job {
 					 for (int i=0;i<row.getLastCellNum();i++){
 						 Cell cell=row.getCell(i);
 						 if(i<18&&i>14){
-							 if(cell==null||cell.equals("")||cell.toString().length()<1){
+							 if(cell==null||cell.equals("")){
 								 throw new JeecgBootException("请填写第"+(x+1)+"行里的"+sheet.getRow(3).getCell(i));
 							 }
 						 }
 						 if(i==2){
-							 if(cell==null||cell.equals("")||cell.toString().length()<1){
+							 if(cell==null||cell.equals("")){
 								 throw new JeecgBootException("请维护第"+(x+1)+"行的申报要素");
 							 }
 						 }
@@ -1221,6 +1221,7 @@ public class SyPackingListFabricController implements Job {
 	 public void execute(JobExecutionContext context) throws JobExecutionException {
 
 		 QueryWrapper<SyPackingListFabric> queryWrapper=new QueryWrapper();
+		 queryWrapper.eq("del_flag","0");
 		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or()
 				 .like("recording_Error","超时").or().eq("recording_Error","null")
 				 .or().eq("recording_Error","nullnull")

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

@@ -1453,12 +1453,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					/*if(item.getPlanLotNumber().indexOf("-")<0){
 						throw new JeecgBootException("缸号不规范，请先进行维护在推送接口");
 					}*/
-					String cbatch=item.getDyelotNumber().substring(0,item.getDyelotNumber().indexOf("-"));
-					mapItem.put("CBATCH",cbatch);//缸号
-					mapItem3.put("CBATCH",cbatch);//缸号
-					mapItem4.put("CBATCH",cbatch);//缸号
-					mapItem5.put("CBATCH",cbatch);//缸号
-					mapItem6.put("CBATCH",cbatch);//缸号
+					//String cbatch=item.getDyelotNumber().substring(0,item.getDyelotNumber().indexOf("-"));
+					mapItem.put("CBATCH",item.getPlanLotNumber());//缸号
+					mapItem3.put("CBATCH",item.getPlanLotNumber());//缸号
+					mapItem4.put("CBATCH",item.getPlanLotNumber());//缸号
+					mapItem5.put("CBATCH",item.getPlanLotNumber());//缸号
+					mapItem6.put("CBATCH",item.getPlanLotNumber());//缸号
 				}
 				num1++;
 				Map<String,Object> orderDataItem=null;// inum

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

@@ -1347,6 +1347,7 @@ public class SyPackingListTailoringController implements Job {
 	 @Override
 	 public void execute(JobExecutionContext context) throws JobExecutionException {
 		 QueryWrapper <SyPackingListTailoring> queryWrapper=new QueryWrapper();
+		 queryWrapper.eq("del_flag","0");
 		 queryWrapper.nested(i->i.ne("recording_Status","1").nested(s->s.eq("push_State","3").or()
 				 .like("recording_Error","超时").or().eq("recording_Error","null")
 				 .or().eq("recording_Error","nullnull")

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

@@ -63,9 +63,9 @@ public class PushJob implements Job {
             codeMaps.put("message","");//推送成功消息
             codeMaps.put("error","");//成功
             if(order.getReadyFabric().equals("成衣")){
-                syPackingListTailoringController.pushInvoice(order.getId(),codeMaps);
+                System.out.println(syPackingListTailoringController.pushInvoice(order.getId(),codeMaps));
             }else{
-                syPackingListFabricController.pushInvoice(order.getId(),codeMaps);
+                System.out.println(syPackingListFabricController.pushInvoice(order.getId(),codeMaps));
             }
             order.setTimeStuta(Integer.parseInt(codeMaps.get("time_Stuta").toString()));
             if(codeMaps.get("message").toString().length()>2){

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

@@ -245,6 +245,10 @@ public class SyPackingListTailoring implements Serializable {
 	@TableField(exist = false)
 	private java.lang.String supplierName;
 
+	/**最终供应商*/
+	@TableField(exist = false)
+	private java.lang.String endSupplierName;//最终供应商
+
 	/**供应商*/
 	@TableField(exist = false)
 	private java.lang.String supplier;

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

@@ -66,6 +66,8 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
 
     public String getCvenName(String cvencode);
 
+    public String getCvenName2(String cvenname);
+
     public String getUnit(String cinvCode);
 
     //获取目标行号   参数当前数据库,目标数据库，销售订单号，目标账套号,行号

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

@@ -333,6 +333,11 @@
         where cVenCode=#{value }
     </select>
 
+    <select id="getCvenName2" parameterType="java.lang.String" resultType="java.lang.String">
+        select cVenName  from Vendor
+        where cVenAbbName =#{value }
+    </select>
+
     <select id="getUnit" parameterType="java.lang.String" resultType="java.lang.String">
         select cInvDefine2 from Inventory
         where cInvCode=#{value }

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

@@ -1973,7 +1973,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 		String account=maps.get("account").toString();
 		//Map<String,List<String>> customers=getSuppliers(codes,listTailorings);//key：供应商编码，value：出库单id
-		Map<String,List<String>> customers=getSuppliers(listTailorings);//key：供应商编码，value：出库单id
+		Map<String,List<String>> customers=getSuppliers(listTailorings);//key：供应商编码，value：出库单单据号
 		System.out.println(account+"采购customers\t"+customers);
 		if(account.equals("102")){
 			//customers=getSuppliers2(codes,listTailorings);//key：供应商编码，value：出库单id
@@ -2027,10 +2027,10 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2().substring(0,10));//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
 			if(account.equals("102")){
-				String	venName=syPackingListTailoringMapper.getCvenName(customer);
+				String	venName=syPackingListTailoringMapper.getCvenName2(syPackingListTailoring.getSupplier());
 				jsonObject1.put("CDEFINE12",venName);//供应商全称
 			}else{
-				String	venName=syPackingListTailoringMapper.getCvenName(customer.split("-")[0]);
+				String	venName=syPackingListTailoringMapper.getCvenName2(syPackingListTailoring.getSupplier());
 				jsonObject1.put("CDEFINE12",venName);//供应商全称
 			}
 			jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
@@ -2193,7 +2193,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
 			System.out.println("syPackingListFabric.getSupplierCode()\t"+syPackingListTailoring.getSupplierCode());
 			if(syPackingListTailoring.getSupplierCode()!=null){
-				String	venName=syPackingListTailoringMapper.getCvenName(syPackingListTailoring.getSupplierCode());
+				String	venName=syPackingListTailoringMapper.getCvenName2(syPackingListTailoring.getSupplier());
 				jsonObject1.put("CDEFINE12",venName);//供应商全称
 			}
 			jsonObject1.put("CBUSTYPE",order.get("cBusType"));//业务类型