记录推送失败信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/scas/mapper/xml/SupplierCapacityMapper.xml

@@ -133,7 +133,7 @@
     </select>
 
     <select id="selectPage2" resultType="org.jeecg.modules.scas.entity.SupplierCapacity">
-         WITH selectTemp AS (SELECT TOP 100 PERCENT ROW_NUMBER() OVER (ORDER BY account) as __row_number__, * FROM Supplier_Capacity_Test p
+         WITH selectTemp AS (SELECT TOP 100 PERCENT ROW_NUMBER() OVER (ORDER BY darrivedate) as __row_number__, * FROM Supplier_Capacity_Test p
         ${ew.customSqlSegment})  SELECT * FROM selectTemp WHERE __row_number__ BETWEEN ${begin} AND ${end} ORDER BY __row_number__
     </select>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -108,7 +108,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                                                      String endDate,
                                                                      @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                                      @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-                                                                     HttpServletRequest req) {
+                                                                     HttpServletRequest req){
         //System.out.println("当前登录用户:"+((LoginUser)SecurityUtils.getSubject().getPrincipal()).getRealname());
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
         long startTime = System.currentTimeMillis();

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

@@ -1135,15 +1135,18 @@ public class SyPackingListFabricController {
 			 if(message!=null&&message.length()>0&&message.indexOf("接口")>-1){
 				 main.setPushState("2");//推送失败！
 				 result.setSuccess(false);
+				 main.setRecordingError(message);
 				 result.setMessage(message);
 			 }else if(message.indexOf("成功")>-1) {
 				 main.setPushState("1");//推送成功！
 				 result.setSuccess(true);
+				 main.setRecordingError(null);
 				 result.setMessage(message);
 			 }else{
 				 main.setPushState("2");//推送失败！
 				 result.setSuccess(false);
 				 result.setMessage(message);
+				 main.setRecordingError(message);
 			 }
 			 result.setResult(main);
 			 main.setRecordingStatus(2);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -196,7 +196,9 @@ public class SyPackingListFabric implements Serializable {
 	/*recording*/
 	@ApiModelProperty(value = "u8推送记录")
 	private String recording;
-
+	/*recording*/
+	@ApiModelProperty(value = "u8推送错误记录")
+	private String recordingError;
 	/*u8推送状态*/
 	@ApiModelProperty(value = "u8推送状态")
 	private Integer recordingStatus;

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

@@ -1399,13 +1399,16 @@ public class SyPackingListTailoringController {
 			if(message!=null&&message.length()>0&&message.indexOf("接口")>-1){
 				main.setPushState("2");//推送失败！
 				result.setSuccess(false);
+				main.setRecordingError(message);
 				result.setMessage(message);
 			}else if(message.indexOf("成功")>-1){
 				main.setPushState("1");//推送成功！
+				main.setRecordingError(null);
 				result.setSuccess(true);
 				result.setMessage(message);
 			}else{
 				main.setPushState("2");//推送失败！
+				main.setRecordingError(message);
 				result.setSuccess(false);
 				result.setMessage(message);
 			}

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

@@ -192,6 +192,10 @@ public class SyPackingListTailoring implements Serializable {
 	@ApiModelProperty(value = "u8推送记录")
 	private String recording;
 
+	/*recording*/
+	@ApiModelProperty(value = "u8推送错误记录")
+	private String recordingError;
+
 	/*u8推送状态*/
 	@ApiModelProperty(value = "u8推送状态")
 	private Integer recordingStatus;