Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-wms/src/main/java/com/klp/controller/WmsCoilPendingActionController.java

@@ -18,9 +18,13 @@ import com.klp.common.core.validate.EditGroup;
 import com.klp.common.enums.BusinessType;
 import com.klp.common.utils.poi.ExcelUtil;
 import com.klp.domain.vo.WmsCoilPendingActionVo;
+import com.klp.domain.vo.TheoryCycleRegressionResultVo;
 import com.klp.domain.bo.WmsCoilPendingActionBo;
 import com.klp.service.IWmsCoilPendingActionService;
 import com.klp.common.core.page.TableDataInfo;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 /**
  * 钢卷待操作
@@ -133,5 +137,17 @@ public class WmsCoilPendingActionController extends BaseController {
     public R<Void> cancelAction(@PathVariable("actionId") Long actionId) {
         return toAjax(iWmsCoilPendingActionService.cancelAction(actionId));
     }
+
+    /**
+     * 计算理论节拍回归（默认近6个月），并返回散点+拟合线
+     */
+    @GetMapping("/theoryCycle/regression")
+    public R<TheoryCycleRegressionResultVo> theoryCycleRegression(
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+        @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+        @RequestParam(value = "includePoints", required = false, defaultValue = "false") Boolean includePoints,
+        @RequestParam(value = "maxPoints", required = false, defaultValue = "2000") Integer maxPoints) {
+        return R.ok(iWmsCoilPendingActionService.calcTheoryCycleRegression(startTime, endTime, includePoints, maxPoints));
+    }
 }