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-15 21:06:37 +08:00
parent 8e7e4cf123
commit 2f300b099a
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,8 +82,8 @@ public class Oms2cWaybillController extends BaseController
@Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT) @Log(title = "OMSExcel草稿方式下单", businessType = BusinessType.INSERT)
@PostMapping(value = "/draftSubmitOrder") @PostMapping(value = "/draftSubmitOrder")
public AjaxResult draftSubmitOrder(@RequestBody EmisWaybill emisWaybillSave){ public AjaxResult draftSubmitOrder(@RequestBody EmisWaybill emisWaybillSave){
waybillOrder.setUserId(getLoginUser().getUser().getId()); emisWaybillSave.setUserId(getLoginUser().getUser().getId());
waybillOrder.setCustomerCode(getLoginUser().getUser().getCustomerCode()); emisWaybillSave.setCustomerCode(getLoginUser().getUser().getCustomerCode());
return this.iRpcWaybillSvc.draftSubmitOrderByOms(emisWaybillSave); return this.iRpcWaybillSvc.draftSubmitOrderByOms(emisWaybillSave);
} }
@ -99,8 +99,7 @@ public class Oms2cWaybillController extends BaseController
return this.iRpcWaybillSvc.preCalcWaybillFeeByOms(waybillOrder); return this.iRpcWaybillSvc.preCalcWaybillFeeByOms(waybillOrder);
} }
@GetMapping("/list")
@RequestMapping("/list")
public TableDataInfo list(EmisWaybill emisWaybill) public TableDataInfo list(EmisWaybill emisWaybill)
{ {
startPage(); startPage();

2
emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -459,7 +459,7 @@
<if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if> <if test="updateSite != null and updateSite != ''"> and a.update_site=#{updateSite}</if>
<if test="userId != null "> and user_id = #{userId}</if> <if test="userId != null "> and a.user_id = #{userId}</if>
and customer_code=#{customerCode} and customer_code=#{customerCode}