Quellcode durchsuchen

面辅料推送u8

huxy vor 2 Jahren
Ursprung
Commit
06c9641ec1

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

@@ -756,7 +756,7 @@ public class SyPackingListFabricController {
 			 for (int i=0;i<ids.length;i++){
 				 SyPackingListFabric main=syPackingListFabricService.getById(ids[i]);
 				 QueryWrapper queryWrapper=new QueryWrapper();
-				 queryWrapper.eq("sy_packing_list_tailoring_id",main.getId());
+				 queryWrapper.eq("sy_packing_list_fabric_id",main.getId());
 				 queryWrapper.eq("del_flag","0");
 				 List<SyPackingListFabricItem> syPackingListTailoringItems=syPackingListFabricItemService.list(queryWrapper);
 				 if(syPackingListTailoringItems!=null){
@@ -786,13 +786,17 @@ public class SyPackingListFabricController {
 					 }
 					 System.out.println("循环后\n"+map);
 				 }
+				 main.setPushState("1");//推送成功!
+				 syPackingListFabricService.updateById(main);//修改成衣
 			 }
 			 result.setSuccess(true);
 			 result.setMessage("u8已成功生成单据");
 		 }catch (Exception e){
+			 SyPackingListFabric main=syPackingListFabricService.getById(ids[0]);
+			 main.setPushState("2");//推送失败!
+			 syPackingListFabricService.updateById(main);//修改成衣
 			 e.printStackTrace();
 			 result.setSuccess(false);
-
 			 result.error500("操作失败:"+e.getMessage());
 		 }
 		 return result;

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

@@ -159,6 +159,10 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "数组来源")
 	private String dataSource;
 
+	/**推送状态*/
+	@ApiModelProperty(value = "推送状态")
+	private String pushState;
+
 	public SyPackingListFabric(){
 
 	}

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.splfi.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.shiro.SecurityUtils;
@@ -701,16 +702,19 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	private PurchaseWarehousingMapper purchaseWarehousingMapper;//采购入库表
 
 	@Override
+	@DS("multi-one")
 	public void one(List<SyPackingListFabric> mains, Map<String, Object> map) {
 		saveBatch(mains,map);
 	}
 
 	@Override
+	@DS("multi-two")
 	public void two(List<SyPackingListFabric> mains, Map<String, Object> map) {
 		saveBatch(mains,map);
 	}
 
 	@Override
+	@DS("multi-three")
 	public void three(List<SyPackingListFabric> mains, Map<String, Object> map) {
 		saveBatch(mains,map);
 	}
@@ -1067,7 +1071,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			/*SyPackingListTailoring syPackingListTailoring=syPackingListTailoringMapper.selectById(id);
 			syPackingListTailoring.setRecording(account+"-"+tableName);
 			syPackingListTailoringMapper.updateById(syPackingListTailoring);*/
-			throw new JeecgBootException("报错账套"+account+"接口"+tableName+",原因\t"+ jsonObject.get("Description"));
+			throw new JeecgBootException("账套"+account+"接口"+tableName+",原因\t"+ jsonObject.get("Description"));
 		}
 	}