From 651dc3c1ecf8ccf99b40859778255f8c7e93fb24 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 23 Apr 2024 07:24:43 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillController.java   | 43 ++++++++++++++++++-
 .../service/IEmisElectronicPagService.java    |  3 --
 .../service/impl/EmisWaybillServiceImpl.java  |  7 ++-
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
index 6c2ff9855..47141366d 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
@@ -13,6 +13,14 @@ package com.xdadan.erp.web.emis;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import cn.hutool.core.lang.Singleton;
+import cn.hutool.core.lang.Snowflake;
+import com.alibaba.fastjson.JSONObject;
+import com.xdadan.erp.common.utils.DBUtil;
+import com.xdadan.erp.emis.domain.vo.WaybillOrder;
+import com.xdadan.erp.emis.service.IEmisElectronicPagService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +37,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisWaybill;
@@ -48,6 +55,40 @@ public class EmisWaybillController extends BaseController
     @Autowired
     private IEmisWaybillService emisWaybillService;
 
+    @Autowired
+    private IEmisElectronicPagService emisElectronicPagService;
+
+//    @PreAuthorize("@ss.hasPermi('emis:emisWaybill:add')")
+    @Log(title = "运单下单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult realSubmitOrder(@RequestBody WaybillOrder waybillOrder)
+    {
+
+        try {
+            EmisWaybill emisWaybill = new EmisWaybill();
+
+            // 如果单号为空，则产生运单号
+            if (StringUtils.isEmpty(waybillOrder.getBillCode())) {
+                emisWaybill.setBillCode(emisElectronicPagService.realMatchWaybill());
+            }
+
+            Snowflake snowflake = Singleton.get(Snowflake.class, 1, 1, true);
+            Long orderId = snowflake.nextId();
+            String orderSn = DBUtil.getSeqNoByLen(7);
+            emisWaybill.setOrderSn(orderId.toString());
+
+            int ret = emisWaybillService.insertEmisWaybill(emisWaybill);
+
+            JSONObject jObjOut = new JSONObject();
+            jObjOut.put("billCode", emisWaybill.getBillCode());
+            jObjOut.put("prodName", emisWaybill.getProductType());
+
+            return AjaxResult.success("下单成功", jObjOut);
+        }catch (Exception ex){
+            return AjaxResult.error("服务器异常，联系客服");
+        }
+    }
+
     /**
      * 查询运单列表列表
      */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
index 9563bc8dd..071dc6809 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
@@ -27,11 +27,8 @@ public interface IEmisElectronicPagService
      */
     public EmisElectronicPag selectEmisElectronicPagById(Long id);
 
-
     public String realMatchWaybill() throws Exception;
 
-
-
     /**
      * 查询电子面单列表
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
index 030e198af..0bc03b06a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
@@ -15,6 +15,8 @@ import java.util.List;
 import cn.hutool.core.lang.Singleton;
 import cn.hutool.core.lang.Snowflake;
 import com.xdadan.erp.common.utils.DBUtil;
+import com.xdadan.erp.emis.service.IEmisElectronicPagService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.domain.EmisWaybill;
@@ -35,6 +37,7 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
 
 
 
+
     /**
      * 精准查询 查询运单列表 by billCode
      *
@@ -86,10 +89,6 @@ public class EmisWaybillServiceImpl implements IEmisWaybillService
     @Override
     public int insertEmisWaybill(EmisWaybill emisWaybill)
     {
-        Snowflake snowflake = Singleton.get(Snowflake.class, 1, 1, true);
-        Long orderId = snowflake.nextId();
-        String orderSn=DBUtil.getSeqNoByLen(7);
-        emisWaybill.setOrderSn(orderId.toString());
         return emisWaybillMapper.insertEmisWaybill(emisWaybill);
     }