修改定时任务和成衣禁止推送手工匹配订单

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -174,7 +174,6 @@
 		WHERE inventory_Ccode NOT LIKE '19%'
 		AND elements_Id IS NOT NULL
 		AND elements_Id !=''
-		and is_Pull is null
 		and del_flag=0
 		and submit_Status='1'
 </select>

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

@@ -1800,7 +1800,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 * @return
 	 */
 	//@Override
-	@Scheduled(fixedRate=1000*60*3)
+	//@Scheduled(fixedRate=1000*60*3)
 	//@Transactional
 	public String getU8Data (){
 		String massage="";
@@ -1822,10 +1822,10 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		if(arrs.length<1){
 			return "没有新的数据";
 		}
-		UpdateWrapper updateWrapper=new UpdateWrapper();
+		/*UpdateWrapper updateWrapper=new UpdateWrapper();
 		updateWrapper.set("is_pull","1");//拉取中
-		updateWrapper.in("sy_order_data_id",Arrays.asList(arrs));
-		syShippingDetailsItemMapper.update(null,updateWrapper);
+		updateWrapper.in("sy_order_data_id",Arrays.asList(arrs));*/
+		//syShippingDetailsItemMapper.update(null,updateWrapper);
 		for (String account : maps.keySet()) {//分成两类数据
 			//先插主表数据，然后根据主表id查询子表数据再添加
 			String sql ="select  distinct   \n" +
@@ -1877,7 +1877,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					String dateNo = "FL" + sf.format(System.currentTimeMillis()) + getOne(queryWrapperCount).getId();//生成辅料单据号*/
 					sy.setDocumentNo(account+sy.getDocumentNo());//单据号
 					QueryWrapper queryWrapper=new QueryWrapper();
-					queryWrapper.eq("documentNo",sy.getDocumentNo());
+					queryWrapper.eq("document_No",sy.getDocumentNo());
 					queryWrapper.eq("del_flag","0");
 					SyPackingListFabric Fabric=syPackingListFabricMapper.selectOne(queryWrapper);
 					if(Fabric!=null){
@@ -2065,9 +2065,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 								updateQuantity(sy1.getActualDeclaredQuantity(),sy1.getSyShippingDetailsItemId(),sy1.getMasterMetering());
 							}
 							items.add(sy1);
-							syShippingDetailsItem.setIsPull("2");//拉取成功
+							/*syShippingDetailsItem.setIsPull("2");//拉取成功
 							syShippingDetailsItem.setIsReference(2);//回写
-							syShippingDetailsItemMapper.updateById(syShippingDetailsItem);//修改
+							syShippingDetailsItemMapper.updateById(syShippingDetailsItem);//修改*/
 						}
 						else{
 							massage+="发运明细未有对应的数据"+sy1.getIsosid();
@@ -2116,6 +2116,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 	@Override
 	public void execute(JobExecutionContext context) throws JobExecutionException {
-		//this.getU8Data();//定时任务直接调用本地方法
+		this.getU8Data();//定时任务直接调用本地方法
 	}
 }

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

@@ -1291,7 +1291,7 @@ public class SyPackingListTailoringController {
 	 public  Result pushToU8(String ids) {
 	 	Result result=new Result();
 	 	try {
-			long startTime = System.currentTimeMillis();
+			//long startTime = System.currentTimeMillis();
 			if(oConvertUtils.isEmpty(ids)){
 				result.setSuccess(false);
 				result.setMessage("请至少选中一条数据");
@@ -1305,7 +1305,7 @@ public class SyPackingListTailoringController {
 			}
 			Map<String,Object> map=new HashMap<>();
 			Map<String,Object> mapdate=syPackingListTailoringService.getSyShippingOrder(ids);
-			System.out.println("madate\t"+mapdate);
+			//System.out.println("madate\t"+mapdate);
 			if(mapdate!=null){
 				if(!mapdate.containsKey("e4")||mapdate.get("e4").equals("0")){
 					result.setSuccess(false);
@@ -1330,17 +1330,10 @@ public class SyPackingListTailoringController {
 					return result;
 				}
 			}
-			if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
-				result.setSuccess(false);
-				result.setMessage("数据在推送中，请不要重复点击");
-				return result;
-			}else{
-				main.setRecordingStatus(1);
-				syPackingListTailoringService.updateById(main);//修改成衣
-			}
-			long endTime2 = System.currentTimeMillis();
-			System.out.println("推送查询时间：" + (endTime2 - startTime) + "ms");
-			System.out.println("getRecordingStatus\t"+main.getRecordingStatus());
+
+			//long endTime2 = System.currentTimeMillis();
+			//System.out.println("推送查询时间：" + (endTime2 - startTime) + "ms");
+			//System.out.println("getRecordingStatus\t"+main.getRecordingStatus());
 			/*QueryWrapper queryWrapper=new QueryWrapper();
 			queryWrapper.eq("sy_packing_list_tailoring_id",main.getId());
 			queryWrapper.eq("del_flag","0");*/
@@ -1357,12 +1350,25 @@ public class SyPackingListTailoringController {
 				SyOrderData syOrderData=syOrderDataMapper.selectById(syPackingListTailoringItems.get(0).getSyOrderDataId());//最终客户
 				if(syOrderData!=null){
 					main.setEndCustomer(syOrderData.getEndCustomer());
-					System.out.println("最终客户\t"+syOrderData.getEndCustomer());
+					//System.out.println("最终客户\t"+syOrderData.getEndCustomer());
+				}
+				if(syOrderData.getDelFlag().equals("1")){
+					result.setSuccess(false);
+					result.setMessage("这是手工匹配订单不能推送");
+					return result;
+				}
+				if(main.getRecordingStatus()!=null&&main.getRecordingStatus()==1){
+					result.setSuccess(false);
+					result.setMessage("数据在推送中，请不要重复点击");
+					return result;
+				}else{
+					main.setRecordingStatus(1);
+					syPackingListTailoringService.updateById(main);//修改成衣
 				}
 				SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectById(syPackingListTailoringItems.get(0).getSyOrderDataItemId());//供应商全称
 				if(syOrderDataItem!=null){
 					main.setSupplierCode(syOrderDataItem.getSupplierCode());
-					System.out.println("客户编码\t"+syOrderDataItem.getSupplierCode());
+					//System.out.println("客户编码\t"+syOrderDataItem.getSupplierCode());
 				}
 				if(main.getPurchase()==null){
 					map.put("mpOrder",main.getSyPackingListTailoringItemList().get(0).getSpurOrSubOrder());//采购委外订单号