面辅料调整

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

@@ -280,23 +280,7 @@ public class SyPackingListFabricController {
 		return result;
 	}
 
-	 @AutoLog(value = "装箱单-面辅料-addtest")
-	 @ApiOperation(value="装箱单-面辅料-addtest", notes="装箱单-面辅料-addtest")
-	 @PostMapping(value = "/addtest")
-	 public  Result<Map<String,String>> testMain() {
-		 Result<Map<String,String>> result=new Result<>();
-		 List<String> ids=new ArrayList<>();
-		 ids.add("9011000002167");
-		 ids.add("9011000002168");
-		 Map<String,String> maps=orderNumber(ids);
-		 if(maps.size()==2){
-			 result.setSuccess(true);
-			 result.setResult(maps);
-			 result.setMessage("手工匹配订单不能跟普通销售订单混合在一起,手工匹配订单是:"+maps.get("手工同步订单"));
-		 }
-		 return result;
-	 }
-
+	 
 	public Map<String,String> orderNumber(List<String> ids){
 	 	QueryWrapper queryWrapper=new QueryWrapper();
 	 	queryWrapper.in("id",ids);
@@ -305,7 +289,7 @@ public class SyPackingListFabricController {
 	 	/*maps.put("正常销售订单","");
 		maps.put("手工同步订单","");*/
 	 	for (SyOrderData orderData : orderDatas){
-	 		if(orderData.getDelFlag().equals("0")){
+	 		if(orderData.getFlag()==0){
 				String name="";
 				if(maps.containsKey("正常销售订单")){
 					name=maps.get("正常销售订单");

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

@@ -119,7 +119,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 	/*maps.put("正常销售订单","");
 		maps.put("手工同步订单","");*/
 		for (SyOrderData orderData : orderDatas){
-			if(orderData.getDelFlag().equals("0")){
+			if(orderData.getFlag()==0){
 				String name="";
 				if(maps.containsKey("正常销售订单")){
 					name=maps.get("正常销售订单");

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

@@ -1352,7 +1352,7 @@ public class SyPackingListTailoringController {
 					main.setEndCustomer(syOrderData.getEndCustomer());
 					//System.out.println("最终客户\t"+syOrderData.getEndCustomer());
 				}
-				if(syOrderData.getDelFlag().equals("1")){
+				if(syOrderData.getFlag()==1){
 					result.setSuccess(false);
 					result.setMessage("这是手工匹配订单不能推送");
 					return result;