aike/emis-oms2c-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-07-14 16:13:43 +08:00
parent a202e16be9
commit e5db8a0df2
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
View File

@ -117,29 +117,7 @@ public class Oms2cWaybillController extends BaseController
@PostMapping(value = "/realSubmitOrder")
public AjaxResult realSubmitOrder(@Valid @RequestBody WaybillOrder waybillOrder,Integer isModify)
{
try {
EmisWaybill emisWaybillSave = waybillOrder.toDb();
emisWaybillService.realSubmitOrder(emisWaybillSave);
JSONObject jObjOut = new JSONObject();
jObjOut.put("billCode", waybillOrder.getBillCode());
return AjaxResult.success("下单成功", jObjOut);
}catch(EmisBizError ex){
ex.printStackTrace();
return AjaxResult.error("("+ex.getErrorCode()+")"+ex.getMessage());
}
catch (DuplicateKeyException e) {
e.printStackTrace();
return AjaxResult.error("运单号重复!");
}
catch (Exception ex){
ex.printStackTrace();
// 返回子定义异常
if(ex instanceof EmisBizError){
return AjaxResult.error("("+((EmisBizError)ex).getErrorCode()+")"+ex.getMessage());
}
return AjaxResult.error("服务器异常，联系客服");
}
return this.iApiwebSvc.realMatchWaybill(waybillOrder,isModify);
}

12
emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IApiwebSvc.java
View File

@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.validation.Valid;
@FeignClient(name = "${service.provider.name}",url = "${service.provider.url}",configuration = {FeignErrorDecoder.class})
public interface IApiwebSvc {
@ -26,4 +28,14 @@ public interface IApiwebSvc {
*/
@PostMapping(value = "/apiweb/emisWaybill/preCalcWaybillFee")
public AjaxResult preCalcWaybillFee(@RequestBody WaybillOrder waybillOrder);
/**
* OMS实时下单
* @param waybillOrder
* @return
*/
@PostMapping(value = "/apiweb/emisWaybill/realSubmitOrderByOms")
public AjaxResult realSubmitOrderByOms(@RequestBody WaybillOrder waybillOrder, Integer isModify);
}