研华1077项目工单号重复问题修正

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

@@ -555,12 +555,6 @@ public class OrderController {
         if (orderNo == null) {
             throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"orderNo"});
         }
-        //
-        LiteOrder order = liteOrderCache.getLiteOrder(orderNo);
-        if (order != null) {
-            OrderDto dto = orderMapper.toDto(order);
-            return ResultBean.newOkResult(dto);
-        }
 
         LiteOrder liteOrder = smfApi.fetchOrder(orderNo, SecurityUtils.getCurrentUsername());
 

src/main/java/com/neotel/smfcore/core/order/service/manager/ILiteOrderManager.java

@@ -9,6 +9,9 @@ import java.util.List;
 
 public interface ILiteOrderManager extends IBaseManager<LiteOrder> {
     LiteOrder findByOrderNo(String orderNo);
+
+    int countByCondition(String field, String value);
+
     LiteOrder createWithItems(LiteOrder liteOrder) throws ValidateException;
 
     List<LiteOrder> findUnEndOrdersList();

src/main/java/com/neotel/smfcore/core/order/service/manager/impl/LiteOrderManagerImpl.java

@@ -3,9 +3,6 @@ package com.neotel.smfcore.core.order.service.manager.impl;
 import com.google.common.collect.Lists;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
-import com.neotel.smfcore.core.barcode.service.dao.IBarcodeDao;
-import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
-import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
 import com.neotel.smfcore.core.order.service.dao.ILiteOrderDao;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderItemManager;
@@ -49,6 +46,11 @@ public class LiteOrderManagerImpl implements ILiteOrderManager {
     }
 
     @Override
+    public int countByCondition(String field, String value){
+        return liteOrderDao.countByCondition(new String[]{field},new String[]{value});
+    }
+
+    @Override
     public LiteOrder get(String id) {
         LiteOrder order= liteOrderDao.findOneById(id);
         if(order!=null&& order.getOrderItems()==null){

src/main/java/com/neotel/smfcore/custom/advantech/AdvantechApi.java

@@ -364,7 +364,9 @@ public class AdvantechApi extends BaseSmfApiListener {
 
                 if(liteOrder == null){
                     liteOrder = new LiteOrder();
-                    liteOrder.setOrderNo(orderNumber);
+                    int orderCount = liteOrderManager.countByCondition("soId", wip_no) + 1;
+                    String newOrderNo = orderNumber + "_" + orderCount;
+                    liteOrder.setOrderNo(newOrderNo);
                     liteOrder.setSoId(wip_no);
                     liteOrder.setLine(line_desc);
                     liteOrder.setSource(line_id);