Merge remote-tracking branch 'origin/master'

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -266,7 +266,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
 
                 whiteOrder.setUpdateBy(SecurityUtils.getUsername());
                 whiteOrder.setUpdateTime(DateUtils.getNowDate());
-                return proOrderWorkorderMapper.updateWhiteWorkOrder(whiteOrder);
+                proOrderWorkorderMapper.updateWhiteWorkOrder(whiteOrder);
             } else if (whiteOrder != null && !"white".equals(whiteOrder.getProdType())) {
                 List<String> wids = new ArrayList<>();//一起下发用
                 List<String> wcodes = new ArrayList<>();//领料单用
@@ -353,10 +353,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 }
                 //下达工单
                 String[] idsArrayAll = (String[])wids.toArray(new String[wids.size()]);
-                return proOrderWorkorderMapper.downWorkorders(idsArrayAll);
+                proOrderWorkorderMapper.downWorkorders(idsArrayAll);
             }
         }
-        return 0;
+        return 1;
     }
 
     //子查父递归