aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-04-23 07:24:43 +08:00
parent a893abb8e1
commit 651dc3c1ec
3 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillController.java
View File

@ -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("服务器异常，联系客服");
}
}
/**
* 查询运单列表列表
*/

3
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisElectronicPagService.java
View File

@ -27,11 +27,8 @@ public interface IEmisElectronicPagService
*/
public EmisElectronicPag selectEmisElectronicPagById(Long id);
public String realMatchWaybill() throws Exception;
/**
* 查询电子面单列表
*

7
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java
View File

@ -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);
}