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-09-01 21:49:20 +08:00
parent 2f7c56e49d
commit 7ffe1bdffa
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -299,15 +299,14 @@ public class EmisWaybillController extends EmisBaseController
/** /**
* 导出进仓单模板 * 导出进仓单模板
* @param response * @param response
* @return * @param orderSn
*/ */
@Log(title = "导出进仓单", businessType = BusinessType.EXPORT) @Log(title = "导出进仓单", businessType = BusinessType.EXPORT)
@PostMapping("/exportWarehouseInTpl") @RequestMapping("/exportWarehouseInTpl")
public void exportWarehouseInTpl(HttpServletResponse response,WaybillOrder waybillOrder) { public void exportWarehouseInTpl(HttpServletResponse response,String orderSn) {
try{ try{
emisWaybillService.genWarehouseInTplFile(response,waybillOrder.getOrderSn()); emisWaybillService.genWarehouseInTplFile(response,orderSn);
// return AjaxResult.success("下载成功");
} }
catch(EmisBizError ex){ catch(EmisBizError ex){
ex.printStackTrace(); ex.printStackTrace();
@ -631,8 +630,7 @@ public class EmisWaybillController extends EmisBaseController
"sendSiteName","destinationName", "sendSiteName","destinationName",
"dispatchUnderlingSiteName", "dispatchUnderlingSiteName",
"pickupMethod", "pickupMethod",
"intoWarehouseBillCode", "intoWarehouseBillCode"
},value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE) },value= EmisWaybill.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@GetMapping("/listSimple") @GetMapping("/listSimple")
public TableDataInfo listSimple(EmisWaybill emisWaybill) public TableDataInfo listSimple(EmisWaybill emisWaybill)
@ -666,23 +664,6 @@ public class EmisWaybillController extends EmisBaseController
// 设置通用权限查询参数 // 设置通用权限查询参数
list = emisWaybillService.selectEmisWaybillList(emisWaybill); list = emisWaybillService.selectEmisWaybillList(emisWaybill);
} }
// if(!StringUtils.isEmpty(emisWaybill.getBillCode())){
// String[] billCodeSortList = emisWaybill.getBillCode().split(",");
// if(billCodeSortList.length>1){
// emisWaybill.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
// }
// }
//
// if(!StringUtils.isEmpty(emisWaybill.getOrderSn())){
// String[] orderSnSortList = emisWaybill.getOrderSn().split(",");
// if(orderSnSortList.length>1){
// emisWaybill.getParams().put("orderSnSortList",Arrays.asList(orderSnSortList));
// }
// }
// List<EmisWaybill> list = emisWaybillService.selectEmisWaybillList(emisWaybill);
return getDataTable(list); return getDataTable(list);
} }