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 04:19:35 +08:00
parent 6f9e25c13f
commit 035fa7f694
2 changed files with 51 additions and 2 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/EmisCommonController.java
View File

@ -16,11 +16,16 @@ 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.EmisBrand;
import com.xdadan.erp.emis.domain.EmisWaybill;
import com.xdadan.erp.emis.domain.vo.Reciever;
import com.xdadan.erp.emis.domain.vo.Sender;
import com.xdadan.erp.emis.domain.vo.WaybillOrder;
import com.xdadan.erp.emis.service.IEmisBrandService;
import com.xdadan.erp.emis.service.IEmisElectronicPagService;
import com.xdadan.erp.emis.service.IEmisWaybillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -41,6 +46,10 @@ public class EmisCommonController extends BaseController
@Autowired
private IEmisElectronicPagService emisElectronicPagService;
@Autowired
private IEmisWaybillService emisWaybillService;
/**
* 获取电子面单单号
*/
@ -60,12 +69,44 @@ public class EmisCommonController extends BaseController
* 获取电子运单信息
*/
@PostMapping(value = "/getWaybillDetail")
public AjaxResult getWaybillDetail()
public AjaxResult getWaybillDetail(String billCode,String custOrderId )
{
try {
// String waybillNo = emisElectronicPagService.realMatchWaybill();
EmisWaybill emisWaybill=null;
if(StringUtils.isEmpty(billCode) && StringUtils.isEmpty(custOrderId) ){
return AjaxResult.error("参数错误");
}
if(!StringUtils.isEmpty(billCode) ){
emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(billCode);
if(emisWaybill==null){
return AjaxResult.error("未找到该运单");
}
}
if(!StringUtils.isEmpty(custOrderId) ) {
emisWaybill = emisWaybillService.selectEmisWaybillByBillCode(custOrderId);
if(emisWaybill==null){
return AjaxResult.error("未找到该运单");
}
}
WaybillOrder waybillOrder = new WaybillOrder();
waybillOrder.setBillCode(emisWaybill.getBillCode());
// 收件人
Reciever reciever = new Reciever();
reciever.setName(emisWaybill.getReceiveName());
waybillOrder.setReciever(reciever);
// 发件人
Sender sender = new Sender();
sender.setName(emisWaybill.getSendName());
waybillOrder.setSender(sender);
waybillOrder.setBillCode("1232");
return AjaxResult.success("获取成功",waybillOrder);

10
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java
View File

@ -28,7 +28,15 @@ public interface IEmisWaybillService
*/
public EmisWaybill selectEmisWaybillByBillCode(String billCode);
/**
/**
* 根据客户单号查询
* @param custOrderId
* @return
*/
// public EmisWaybill selectEmisWaybillByCustOrderId(String custOrderId);
/**
* 主键查询
* @param id
* @return