点料历史上传修改

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java

@@ -276,7 +276,7 @@ public class EquipViewController {
     @PreAuthorize("@el.check('equipmentView:info')")
     @PreAuthorize("@el.check('equipmentView:info')")
     public XCounterViewDto xCounterView(String cid, HttpServletRequest servletRequest){
     public XCounterViewDto xCounterView(String cid, HttpServletRequest servletRequest){
         Equipment equip = equipmentCache.getEquipment(cid);
         Equipment equip = equipmentCache.getEquipment(cid);
-        if (equip == null ||(!equip.isNEOSCAN())) {
+        if (equip == null ||(!equip.isNEOCOUNTER())) {
             throw  new ValidateException("smfcore.equip.notExist","设备不存在");
             throw  new ValidateException("smfcore.equip.notExist","设备不存在");
         }
         }
         XCounterViewDto dto=new XCounterViewDto();
         XCounterViewDto dto=new XCounterViewDto();

src/main/java/com/neotel/smfcore/core/equipment/service/po/Equipment.java

@@ -36,7 +36,9 @@ public class Equipment extends BasePo implements Serializable {
         return EquipmentType.NEOSCAN.name().equals(type)||EquipmentType.NS200.name().equals(type)||EquipmentType.NS100.name().equals(type);
         return EquipmentType.NEOSCAN.name().equals(type)||EquipmentType.NS200.name().equals(type)||EquipmentType.NS100.name().equals(type);
     }
     }
 
 
-
+    public boolean isNEOCOUNTER() {
+        return EquipmentType.NEOCOUNTER.name().equals(type);
+    }
     /**
     /**
      * 是否是接口设备
      * 是否是接口设备
      * @return
      * @return

src/main/java/com/neotel/smfcore/core/xRay/rest/XrayDataController.java

@@ -14,6 +14,7 @@ import com.neotel.smfcore.core.xRay.rest.query.CountingHistoryQueryCriteria;
 import com.neotel.smfcore.core.xRay.service.manager.ICountingHistoryManager;
 import com.neotel.smfcore.core.xRay.service.manager.ICountingHistoryManager;
 import com.neotel.smfcore.core.xRay.service.po.CountingHistory;
 import com.neotel.smfcore.core.xRay.service.po.CountingHistory;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +36,7 @@ import java.util.*;
 @Slf4j
 @Slf4j
 @RestController
 @RestController
 @RequestMapping("service/xRayData")
 @RequestMapping("service/xRayData")
+@Api(tags = "X800:点料记录")
 public class XrayDataController {
 public class XrayDataController {
 
 
     @Autowired
     @Autowired

src/main/java/com/neotel/smfcore/core/xRay/rest/dto/CountingHistoryDto.java

@@ -17,10 +17,10 @@ public class CountingHistoryDto {
     @ApiModelProperty("卷轴编号（Reel Number） ")
     @ApiModelProperty("卷轴编号（Reel Number） ")
     private String ri = "";
     private String ri = "";
 
 
-    @ApiModelProperty("是否为不良品的标识 ")
-    private boolean ng = false;
+    @ApiModelProperty("是否NG ")
+    private boolean isNG = false;
 
 
-    @ApiModelProperty("不良品信息 ")
+    @ApiModelProperty("NG信息 ")
     private String ngMsg = "";
     private String ngMsg = "";
 
 
     @ApiModelProperty("数量 ")
     @ApiModelProperty("数量 ")
@@ -29,18 +29,18 @@ public class CountingHistoryDto {
     @ApiModelProperty("标签状态 ")
     @ApiModelProperty("标签状态 ")
     private String lblState;
     private String lblState;
 
 
-    @ApiModelProperty("其他消息（Other Message） ")
+    @ApiModelProperty("其他消息")
     private String oMSG;
     private String oMSG;
 
 
-    @ApiModelProperty("TD条形码（可能是特定业务中的一种条形码） ")
+    @ApiModelProperty("条码")
     private String tdBarcode;
     private String tdBarcode;
 
 
-    @ApiModelProperty("XRay文件路径或相关标识 ")
+    @ApiModelProperty("XRay文件 ")
     private String xRayFile;
     private String xRayFile;
 
 
-    @ApiModelProperty("结果文件路径或相关标识 ")
+    @ApiModelProperty("结果文件 ")
     private String resultFile;
     private String resultFile;
 
 
-    @ApiModelProperty("是否上传到smf完成，1=完成，0=未完成 ")
-    private int uploadOk = 0;
+
+
 }
 }

src/main/java/com/neotel/smfcore/core/xRay/rest/query/CountingHistoryQueryCriteria.java

@@ -13,11 +13,13 @@ public class CountingHistoryQueryCriteria {
     @QueryCondition(blurry = "pn,ri,ngMsg,oMSG,tdBarcode")
     @QueryCondition(blurry = "pn,ri,ngMsg,oMSG,tdBarcode")
     private String blurry;
     private String blurry;
 
 
-    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private BetweenData<Date> updateDate;
-
+//    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "updateDate")
+//    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    private BetweenData<Date> updateDate;
 
 
+    @QueryCondition(type = QueryCondition.Type.BETWEEN, propName = "countingTime")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private BetweenData<Date> countingTime;
 
 
     @QueryCondition
     @QueryCondition
     @ApiModelProperty("cid")
     @ApiModelProperty("cid")