销售发货准时率BUG修复

src/main/java/com/topsunit/scanservice/ximai/common/Knife4jConfiguration.java

@@ -23,14 +23,14 @@ public class Knife4jConfiguration implements WebMvcConfigurer {
                         .title("MES RESTful APIs")
                         .description("# MES RESTful APIs")
                         .termsOfServiceUrl("http://www.topsunit.com/")
-                        .contact(new Contact("dev", "dev.topsunit.scanservice", "xxx@topsunit.com"))
+                        .contact(new Contact("dev", "com.topsunit.scanservice", "xxx@topsunit.com"))
                         .version("4.0")
                         .build())
                 //分组名称
                 .groupName("4.1版本")
                 .select()
                 //这里指定Controller扫描包路径
-                .apis(RequestHandlerSelectors.basePackage("dev.topsunit.scanservice.ximai.controller"))
+                .apis(RequestHandlerSelectors.basePackage("com.topsunit.scanservice.ximai.controller"))
                 .paths(PathSelectors.any())
                 .build();
     }

src/main/java/com/topsunit/scanservice/ximai/controller/CmsmvController.java

@@ -7,6 +7,8 @@ import com.topsunit.scanservice.ximai.dto.LoginResult;
 import com.topsunit.scanservice.ximai.dto.SetPasswordParams;
 import com.topsunit.scanservice.ximai.security.PassToken;
 import com.topsunit.scanservice.ximai.service.CmsmvService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @version V1.0
  * @date 2021/10/18
  */
+@Api("员工基本信息档")
 @RestController
 public class CmsmvController {
     private final CmsmvService cmsmvService;
@@ -28,6 +31,7 @@ public class CmsmvController {
         this.cmsmvService = cmsmvService;
     }
 
+    @ApiOperation("登录")
     @PassToken
     @PostMapping("/login")
     public LoginResult login(@RequestBody LoginParams loginParams) {

src/main/java/com/topsunit/scanservice/ximai/dto/MocteCreateDto.java

@@ -44,7 +44,7 @@ public class MocteCreateDto {
     /**
      * 批管理 N=批管理
      */
-    @ApiModelProperty("批管理 N=批管理")
+    @ApiModelProperty("批管理 N:不需要、Y:需要不检查库存量、W:仅需警告、T:需要且检查库存量")
     private String mb022;
 
     private Boolean islot = false;

src/main/java/com/topsunit/scanservice/ximai/dto/SfctcDto.java

@@ -42,7 +42,7 @@ public class SfctcDto {
     private String tc032;
     @ApiModelProperty("转移数量")
     private BigDecimal tc036;
-    @ApiModelProperty("")
+    @ApiModelProperty("库位")
     private String tc056;
 
 }

src/main/java/com/topsunit/scanservice/ximai/dto/SfctcStorageCheckCriteria.java

 package com.topsunit.scanservice.ximai.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 /**
  * <p>Title: SfctcStorageCheckCriteria</p>
  * <p>Description: 入库检验 - 查询参数</p>
@@ -8,41 +11,14 @@ package com.topsunit.scanservice.ximai.dto;
  * @version V1.0
  * @date 2021/10/28
  */
+@Data
 public class SfctcStorageCheckCriteria {
+    @ApiModelProperty("工单单别")
     private String tc004;
+    @ApiModelProperty("工单单号")
     private String tc005;
+    @ApiModelProperty("移出加工顺序")
     private String tc006;
+    @ApiModelProperty("库位")
     private String tc056;
-
-    public String getTc004() {
-        return tc004;
-    }
-
-    public void setTc004(String tc004) {
-        this.tc004 = tc004;
-    }
-
-    public String getTc005() {
-        return tc005;
-    }
-
-    public void setTc005(String tc005) {
-        this.tc005 = tc005;
-    }
-
-    public String getTc006() {
-        return tc006;
-    }
-
-    public void setTc006(String tc006) {
-        this.tc006 = tc006;
-    }
-
-    public String getTc056() {
-        return tc056;
-    }
-
-    public void setTc056(String tc056) {
-        this.tc056 = tc056;
-    }
 }

src/main/java/com/topsunit/scanservice/ximai/service/kanban/MaterialStatService.java

@@ -36,7 +36,7 @@ public class MaterialStatService {
             }
         });
         List<SalesTimelyDeliveryRatio> tempList = moctaDao.statSalesTimelyDeliveryRatio(startDate, endDate);
-        int unTimeCt = 0;//销售发货准时率
+        int unTimeCt = tempList.size();//销售发货准时率
         String dateStr = DateUtil.format(LocalDateTime.now(), "yyyyMMdd");
         for(SalesTimelyDeliveryRatio temp : tempList){
             String tempDate = temp.getOutDate();
@@ -47,9 +47,9 @@ public class MaterialStatService {
             Integer currDate = Integer.valueOf(dateStr);
             Integer planDate = Integer.valueOf(temp.getPlanOutDate());
             if(date>planDate){
-                unTimeCt++;
+                unTimeCt--;
             }else if(currDate>planDate && temp.getOutQuantity().compareTo(temp.getPlanOutQuantity())<0){
-                unTimeCt++;
+                unTimeCt--;
             }
         }
         if(tempList.size()!=0){