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

Merge pull request 'demand:TMS系统-小程序/OMS/TMS/APP系统下单/批量导入下单-寄件国家是缅甸和柬埔寨的自动获取的运单号/子单号 7080开头 不带T' (#1) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-api-service/pulls/1
This commit is contained in:
heyu 2025-10-21 17:00:43 +08:00
commit ec9d50c55f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emis-api-web/src/main/java/com/xdadan/erp/apiweb/WaybillController.java
View File

@ -1,11 +1,11 @@
/** /**
* @Project: emis * @Project: emis
* @Title: EmisWaybillController.java * @Title: EmisWaybillController.java
* @author linfso * @author linfso
* @date 2024-02-29 08:15:14 * @date 2024-02-29 08:15:14
* @Copyright: ShangHai Duta 2022 All rights reserved. * @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0 * @version v1.0
* @Description: <p> 运单列表 控制器 </p> * @Description: <p> 运单列表 控制器 </p>
*/ */
@ -58,7 +58,7 @@ import java.util.*;
/** /**
* 运单列表Controller * 运单列表Controller
* *
* @author linfso * @author linfso
* @date 2024-02-29 08:15:14 * @date 2024-02-29 08:15:14
*/ */
@ -298,7 +298,7 @@ public class WaybillController extends BaseController
emisWaybillService.realSubmitOrderByOms(emisWaybillSave); emisWaybillService.realSubmitOrderByOms(emisWaybillSave);
JSONObject jObjOut = new JSONObject(); JSONObject jObjOut = new JSONObject();
jObjOut.put("billCode", waybillOrder.getBillCode()); jObjOut.put("billCode", emisWaybillSave.getBillCode());
// jObjOut.put("prodName", waybillOrder.getProductType()); // jObjOut.put("prodName", waybillOrder.getProductType());
return AjaxResult.success("下单成功", jObjOut); return AjaxResult.success("下单成功", jObjOut);