成衣推送修改

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

@@ -1262,14 +1262,7 @@ public class SyPackingListTailoringController {
 			}
 			result.setResult(main);
 			syPackingListTailoringService.updateById(main);//修改成衣
-		}catch (Exception e){/*
-			SyPackingListTailoring main=syPackingListTailoringService.getById(ids);
-			main.setPushState("2");//推送失败！
-			String []messages=e.getMessage().split("fengexian");
-			if(messages.length>1){
-				main.setRecording(messages[1]);
-			}
-			syPackingListTailoringService.updateById(main);//修改成衣*/
+		}catch (Exception e){
 			e.printStackTrace();
 			result.setSuccess(false);
 			result.error500("操作失败："+e.getMessage());

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 recordingCode;
+
 	/**syOrderDataId*/
 	//@Excel(name = "syOrderDataId", width = 15)
 	@ApiModelProperty(value = "syOrderDataId")

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

@@ -231,7 +231,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			s1.setId(null);
 			s1.setDelFlag("0");
 			System.out.println("actualPackingQty数量\t"+s1.getActualPackingQty());
+			BigDecimal total=s1.getTotal();
 			s1.setTotal(s1.getActualPackingQty().multiply(s1.getBoxNumber()));//各尺码数量
+			s1.setActualPackingQty(total);//合计
 			s1.setSyPackingListTailoringId(syPackingListTailoring.getId());//主表id
 			s1.setSyPreAssembledPackingListId(syPackingListTailoring.getSyPreAssembledPackingListId());//预装箱单主表id
 
@@ -917,6 +919,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			}
 			mapt.put("itemSort",mapSort);
 		}
+
+
+
 		text(mapList,"采购入库单");
 		text(mapList3,"销售发货单");
 		text(mapList5,"采购发票单");
@@ -1090,7 +1095,12 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	public String result(SyPackingListTailoring main,JSONArray jsonArray,String tableName ,String account,String index){
 		JSONObject jsonObject=jsonArray.getJSONObject(0);
 		if(jsonObject.get("Result").equals("F")){//获取发货单是否成功添加
-			throw new JeecgBootException(account+"账套"+tableName+"接口"+","+ jsonObject.get("Description")+"!");
+			throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
+		}
+		if(main.getRecordingCode()!=null){
+			main.setRecordingCode(main.getRecordingCode()+";"+account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+		}else{
+			main.setRecordingCode(account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
 		}
 		return account+"-"+index+"-"+jsonObject.get("ReceiptNo");//账套号-序号-生成的单号
 	}