气密修改

src/main/java/com/jeesite/modules/mes/web/MesProductQmController.java

@@ -61,9 +61,9 @@ public class MesProductQmController extends BaseController {
 	@RequiresPermissions("mes:mesProductQm:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(MesProductQm mesProductQm, Model model) {
-		MesSearchDateReq dateMap = CommonUitl.getSearchDate();
+		/*MesSearchDateReq dateMap = CommonUitl.getSearchDate();
 		mesProductQm.setTestTime_gte(dateMap.getStartDate());
-		mesProductQm.setTestTime_lte(dateMap.getEndtDate());
+		mesProductQm.setTestTime_lte(dateMap.getEndtDate());*/
 		model.addAttribute("mesProductQm", mesProductQm);
 		return "modules/mes/mesProductQmList";
 	}

src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -1,89 +1,35 @@
 package com.jeesite.modules.mes.web;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URLDecoder;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.github.s7connector.api.DaveArea;
-import com.github.s7connector.api.S7Connector;
-import com.github.s7connector.api.S7Serializer;
-import com.github.s7connector.api.factory.S7ConnectorFactory;
-import com.github.s7connector.api.factory.S7SerializerFactory;
-//import com.github.xingshuangs.iot.protocol.common.buff.ByteReadBuff;
-import com.github.xingshuangs.iot.protocol.s7.enums.ENckArea;
-import com.github.xingshuangs.iot.protocol.s7.enums.ENckModule;
-import com.github.xingshuangs.iot.protocol.s7.enums.EPlcType;
-import com.github.xingshuangs.iot.protocol.s7.model.DataItem;
-import com.github.xingshuangs.iot.protocol.s7.model.RequestNckItem;
-import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
-import com.jeesite.common.cache.CacheUtils;
-import com.jeesite.common.codec.DesUtils;
 import com.jeesite.common.collect.ListUtils;
 import com.jeesite.common.collect.MapUtils;
+import com.jeesite.common.config.Global;
+import com.jeesite.common.entity.Page;
 import com.jeesite.common.lang.DateUtils;
 import com.jeesite.common.lang.StringUtils;
 import com.jeesite.common.mybatis.mapper.query.QueryType;
 import com.jeesite.common.service.ServiceException;
 import com.jeesite.common.utils.excel.ExcelExport;
-import com.jeesite.common.web.CookieUtils;
+import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.file.entity.FileUpload;
 import com.jeesite.modules.file.service.FileUploadService;
-import com.jeesite.modules.file.utils.FileUploadUtils;
 import com.jeesite.modules.mes.entity.*;
 import com.jeesite.modules.mes.req.MesDeviceStateReq;
 import com.jeesite.modules.mes.req.MesProductQmReq;
 import com.jeesite.modules.mes.req.MesSearchDateReq;
 import com.jeesite.modules.mes.resp.BindMaterialResp;
 import com.jeesite.modules.mes.resp.CommonResp;
-import com.jeesite.modules.mes.resp.MesShiftDataResp;
 import com.jeesite.modules.mes.resp.ParamsResp;
 import com.jeesite.modules.mes.service.*;
 import com.jeesite.modules.mes.util.CommonUitl;
-import com.jeesite.modules.sys.entity.DictData;
 import com.jeesite.modules.sys.entity.User;
-import com.jeesite.modules.sys.utils.DictUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
-import com.jeesite.modules.utils.*;
-import io.netty.buffer.ByteBuf;
-import io.swagger.models.auth.In;
+import com.jeesite.modules.utils.ErrorMsg;
+import com.jeesite.modules.utils.MesMsgUtils;
+import com.jeesite.modules.utils.ProtocolParam;
 import net.sourceforge.tess4j.TesseractException;
-import org.apache.commons.csv.CSVFormat;
-import org.apache.commons.csv.CSVPrinter;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.tomcat.util.codec.binary.Base64;
-import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider;
-import org.eclipse.milo.opcua.sdk.client.api.identity.UsernameProvider;
-import org.eclipse.milo.opcua.stack.core.AttributeId;
-import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
-import org.eclipse.milo.opcua.stack.core.types.builtin.*;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
-import org.eclipse.milo.opcua.stack.core.types.enumerated.MonitoringMode;
-import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
-import org.eclipse.milo.opcua.stack.core.types.structured.MonitoredItemCreateRequest;
-import org.eclipse.milo.opcua.stack.core.types.structured.MonitoringParameters;
-import org.eclipse.milo.opcua.stack.core.types.structured.ReadValueId;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -91,13 +37,21 @@ import org.springframework.ui.Model;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-
-import com.jeesite.common.config.Global;
-import com.jeesite.common.entity.Page;
-import com.jeesite.common.web.BaseController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+
 /**
  * 生产记录Controller
  * @author hzd
@@ -3256,7 +3210,7 @@ public class MesProductRecordController extends BaseController {
 			mesProductQm.setTestPressure(testPressure);
 			mesProductQm.setTestPressureUnit(testPressureUnit);
 			mesProductQm.setTestResult(result);
-			mesProductQm.setTestTime(CommonUitl.String2DateTime(testTime));
+			mesProductQm.setTestTime(new Date());
 			mesProductQm.setProgramNo(cxm);
 			mesProductQm.setTitle(title);
 			mesProductQm.setRemark(remark);