合单展示工单不全和错误问题

接口异常展示问题
入库同步去除,解决多人入库慢的问题

pom.xml

@@ -26,6 +26,7 @@
 		<fastjson.version>1.2.70</fastjson.version>
 		<swagger.version>2.9.2</swagger.version>
 		<log4j2.version>2.17.0</log4j2.version>
+		<classfinal.version>1.2.1</classfinal.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -304,6 +305,46 @@
 					</execution>
 				</executions>
 			</plugin>
+            <plugin>
+                <!-- https://gitee.com/roseboy/classfinal -->
+                <groupId>net.roseboy</groupId>
+                <artifactId>classfinal-maven-plugin</artifactId>
+                <version>${classfinal.version}</version>
+                <configuration>
+					<!--加密密码，如果是#号，则使用无密码模式加密，【加密后没有pom文件，不用担心泄漏】
+
+					将加密后的war放在tomcat/webapps下， tomcat/bin/catalina 增加以下配置:
+
+//linux下 catalina.sh
+CATALINA_OPTS="$CATALINA_OPTS -javaagent:classfinal-fatjar.jar='-pwd 0000000'";
+export CATALINA_OPTS;
+
+
+
+//win下catalina.bat
+set JAVA_OPTS="-javaagent:classfinal-fatjar.jar='-pwd 000000'"
+
+//参数说明
+// -pwd      加密项目的密码
+// -nopwd    无密码加密时启动加上此参数，跳过输密码过程
+// -pwdname  环境变量中密码的名字
+					-->
+                    <password>#</password>
+<!--					<code>F0CC84061C58DADF9AC3F20600C6EF6398CB5A55F9A086A9671136521C4B40CF5F7589F6D78A591D6456AA5055E1E9E9</code>-->
+                    <packages>com.neotel</packages>
+                    <cfgfiles>application.yml</cfgfiles>
+                    <excludes>org.spring</excludes>
+<!--                    <libjars>a.jar,b.jar</libjars>-->
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>classFinal</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 		</plugins>
 	</build>
 

src/main/java/com/neotel/smfcore/core/hik/rest/InterfaceExceptionController.java

@@ -44,8 +44,8 @@ public class InterfaceExceptionController {
     public PageData<InterfaceExDto> list(InterfaceExCriteria criteria, Pageable pageable) {
         Query query= QueryHelp.getQuery(criteria);
         List<InterfaceExDto> results = new ArrayList<>();
-        List<HikApiRequestError> requests = hikApiRequestErrorDao.findByQuery(query,pageable);
         int totalCount = hikApiRequestErrorDao.countByQuery(query);
+        List<HikApiRequestError> requests = hikApiRequestErrorDao.findByQuery(query,pageable);
         for (HikApiRequestError request : requests) {
             InterfaceExDto dto = toDto(request);
             results.add(dto);

src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java

@@ -169,7 +169,7 @@ public class SingleInController {
         return codeInProcess(mapValues, request);
     }
 
-    private synchronized  ResultBean codeInProcess(Map<String, String> mapValues,HttpServletRequest request){
+    private ResultBean codeInProcess(Map<String, String> mapValues,HttpServletRequest request){
         //参数：code:条形码，
         // storageId:料架ID,
         // inType:入库类型（1=普通入库，2=并盘入库，3=截料入库，4=退料入库,5=转储入库）

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -333,10 +333,18 @@ public class LiteOrderCache implements ITaskListener {
             long deleteCount = liteOrderItemManager.deleteByOrderNo(liteOrder.getOrderNo());
             log.info("删除工单["+liteOrder.getOrderNo()+"]的旧item,原有"+liteOrder.getOrderItems().size()+"条, 删除"+ deleteCount+"条,新增 " + newItems.size()+"条");
             List<LiteOrderItem> newOrderItems = Lists.newArrayList();
-            for (HikOrderInfo apiItems : newItems) {
-                LiteOrderItem newItem = apiItems.crateOrderItem(liteOrder.getOrderNo());
+
+            HikOrderInfo outInfo = null;
+            for (HikOrderInfo apiItem : newItems) {
+                LiteOrderItem newItem = apiItem.crateOrderItem(liteOrder.getOrderNo());
 //                liteOrder = updateOrderItem(liteOrder, newItem);
                 newOrderItems.add(newItem);
+                if(outInfo == null){
+                    outInfo = apiItem;
+                }
+            }
+            if(outInfo != null){
+                liteOrder.UpdateOutInfo(outInfo);
             }
             liteOrder.setOrderItems(newOrderItems);
             liteOrderManager.createWithItems(liteOrder);

src/main/java/com/neotel/smfcore/core/order/rest/RepleOrderController.java

@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.order.OrderPnCache;
 import com.neotel.smfcore.core.order.bean.OrderBoxInfo;
 import com.neotel.smfcore.core.order.bean.OrderPnInfo;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
+import com.neotel.smfcore.core.order.enums.ORDER_COLOR;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderDto;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderItemDto;
 import com.neotel.smfcore.core.order.rest.bean.dto.OrderPnDto;

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -204,7 +204,7 @@ public class DataLog extends BasePo implements Serializable {
     /**
      * 出库时记录此料在库时长 ，分钟
      */
-    private long inStoreTime=0l;
+    private long inStoreTime=0L;
     /**
      * 如果是出库任务，需要记录入库时间
      */

src/main/java/com/neotel/smfcore/hikvision/HikApiCache.java

@@ -12,6 +12,7 @@ import com.neotel.smfcore.hikvision.util.HttpHelper;
 import com.neotel.smfcore.hikvision.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.PostConstruct;
@@ -47,9 +48,9 @@ public class HikApiCache {
     private static void initApiRequestMap() {
         Map<String, HikApiRequest> dbFailedRequestMap = dataCache.getCache(Constants.CACHE_failedRequestMap);
         if (dbFailedRequestMap != null && dbFailedRequestMap.size() > 0) {
-            List<HikApiRequestError> failedList = new ArrayList<>();
+            List<HikApiRequest> failedList = new ArrayList<>();
             for (HikApiRequest dbRequest : dbFailedRequestMap.values()) {
-                HikApiRequestError requestError = new HikApiRequestError();
+                HikApiRequest requestError = new HikApiRequest();
                 requestError.setApiType(dbRequest.getApiType());
                 requestError.setUrl(dbRequest.getUrl());
                 requestError.setKey(dbRequest.getKey());

src/main/java/com/neotel/smfcore/hikvision/bean/api/HikApiRequest.java

@@ -13,6 +13,9 @@ import java.util.Map;
 @Data
 public class HikApiRequest extends HikApiRequestError {
 
+    public HikApiRequest() {
+    }
+
     public HikApiRequest(int apiType, String url, String key, String secret, RequestParam param){
         this.apiType=apiType;
         this.url=url;

src/main/java/com/neotel/smfcore/hikvision/service/dao/impl/HikApiRequestErrorDaoImpl.java

 package com.neotel.smfcore.hikvision.service.dao.impl;
 
 import com.neotel.smfcore.common.base.AbstractBaseDao;
+import com.neotel.smfcore.hikvision.bean.api.HikApiRequest;
 import com.neotel.smfcore.hikvision.service.dao.IHikApiRequestErrorDao;
 import com.neotel.smfcore.hikvision.service.po.HikApiRequestError;
 import org.springframework.data.domain.Sort;
@@ -13,7 +14,7 @@ import java.util.List;
 public class HikApiRequestErrorDaoImpl extends AbstractBaseDao implements IHikApiRequestErrorDao {
     @Override
     public Class getEntityClass() {
-        return HikApiRequestError.class;
+        return HikApiRequest.class;
     }
 
     @Override