|
@ -32,6 +32,7 @@ import com.yxt.common.core.vo.PagerVo; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; |
|
|
|
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; |
|
|
import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo; |
|
@ -69,7 +70,7 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("根据条件分页查询数据的列表") |
|
|
@ApiOperation("根据条件分页查询数据的列表") |
|
|
@PostMapping("/listPage") |
|
|
@PostMapping("/listPage") |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillQuery> pq){ |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillQuery> pq) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
PagerVo<WmsInventoryCheckbillVo> pv = wmsInventoryCheckbillService.listPageVo(pq); |
|
|
PagerVo<WmsInventoryCheckbillVo> pv = wmsInventoryCheckbillService.listPageVo(pq); |
|
|
return rb.success().setData(pv); |
|
|
return rb.success().setData(pv); |
|
@ -77,13 +78,13 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("新建盘点单") |
|
|
@ApiOperation("新建盘点单") |
|
|
@PostMapping("/save") |
|
|
@PostMapping("/save") |
|
|
public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){ |
|
|
public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto) { |
|
|
return wmsInventoryCheckbillService.saveOrUpdateDto(dto); |
|
|
return wmsInventoryCheckbillService.saveOrUpdateDto(dto); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("生成盘点报告") |
|
|
@ApiOperation("生成盘点报告") |
|
|
@PostMapping("/createReport") |
|
|
@PostMapping("/createReport") |
|
|
public ResultBean createReport(@RequestParam("sid") String sid){ |
|
|
public ResultBean createReport(@RequestParam("sid") String sid) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
wmsInventoryCheckbillService.createReport(sid); |
|
|
wmsInventoryCheckbillService.createReport(sid); |
|
|
return rb.success(); |
|
|
return rb.success(); |
|
@ -91,7 +92,7 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("查看盘点报告") |
|
|
@ApiOperation("查看盘点报告") |
|
|
@PostMapping("/viewReport") |
|
|
@PostMapping("/viewReport") |
|
|
public ResultBean<WmsInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid){ |
|
|
public ResultBean<WmsInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid); |
|
|
WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid); |
|
|
return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo); |
|
|
return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo); |
|
@ -99,7 +100,7 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("生成盘点报告PDF") |
|
|
@ApiOperation("生成盘点报告PDF") |
|
|
@PostMapping("/createPdf") |
|
|
@PostMapping("/createPdf") |
|
|
public ResultBean<String> createPdf(@RequestParam("sid") String sid){ |
|
|
public ResultBean<String> createPdf(@RequestParam("sid") String sid) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
String url = wmsInventoryCheckbillService.createPdf(sid); |
|
|
String url = wmsInventoryCheckbillService.createPdf(sid); |
|
|
return rb.success().success().setData(url); |
|
|
return rb.success().success().setData(url); |
|
@ -107,13 +108,13 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("根据sid批量删除") |
|
|
@ApiOperation("根据sid批量删除") |
|
|
@DeleteMapping("/delBySids") |
|
|
@DeleteMapping("/delBySids") |
|
|
public ResultBean delBySids(@RequestBody String[] sids){ |
|
|
public ResultBean delBySids(@RequestBody String[] sids) { |
|
|
return wmsInventoryCheckbillService.delAll(sids); |
|
|
return wmsInventoryCheckbillService.delAll(sids); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ApiOperation("盘点-查看库位盘点列表") |
|
|
@ApiOperation("盘点-查看库位盘点列表") |
|
|
@PostMapping("/detailRackPageList") |
|
|
@PostMapping("/detailRackPageList") |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackPageListVo>> detailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackPageListQuery> pq){ |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackPageListVo>> detailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackPageListQuery> pq) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
PagerVo<WmsInventoryCheckbillDetailRackPageListVo> pv = wmsInventoryCheckbillService.detailRackPageList(pq); |
|
|
PagerVo<WmsInventoryCheckbillDetailRackPageListVo> pv = wmsInventoryCheckbillService.detailRackPageList(pq); |
|
|
return rb.success().setData(pv); |
|
|
return rb.success().setData(pv); |
|
@ -121,7 +122,7 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("盘点-查看商品盘点列表") |
|
|
@ApiOperation("盘点-查看商品盘点列表") |
|
|
@PostMapping("/detailGoodPageList") |
|
|
@PostMapping("/detailGoodPageList") |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillDetailGoodPageListVo>> detailGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq){ |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillDetailGoodPageListVo>> detailGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> pv = wmsInventoryCheckbillService.detailGoodPageList(pq); |
|
|
PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> pv = wmsInventoryCheckbillService.detailGoodPageList(pq); |
|
|
return rb.success().setData(pv); |
|
|
return rb.success().setData(pv); |
|
@ -129,7 +130,7 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("查看库位商品盘点列表") |
|
|
@ApiOperation("查看库位商品盘点列表") |
|
|
@PostMapping("/detailRackGoodPageList") |
|
|
@PostMapping("/detailRackGoodPageList") |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq){ |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq); |
|
|
PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq); |
|
|
return rb.success().setData(pv); |
|
|
return rb.success().setData(pv); |
|
@ -139,7 +140,7 @@ public class WmsInventoryCheckbillRest { |
|
|
|
|
|
|
|
|
@ApiOperation("app-盘点-查看库位盘点列表") |
|
|
@ApiOperation("app-盘点-查看库位盘点列表") |
|
|
@PostMapping("/appDetailRackPageList") |
|
|
@PostMapping("/appDetailRackPageList") |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> appDetailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillPageQuery> pq){ |
|
|
public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> appDetailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillPageQuery> pq) { |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
PagerVo<WmsInventoryCheckbillPageVo> pv = wmsInventoryCheckbillService.appDetailRackPageList(pq); |
|
|
PagerVo<WmsInventoryCheckbillPageVo> pv = wmsInventoryCheckbillService.appDetailRackPageList(pq); |
|
|
return rb.success().setData(pv); |
|
|
return rb.success().setData(pv); |
|
@ -148,9 +149,16 @@ public class WmsInventoryCheckbillRest { |
|
|
@ApiOperation("办理/扫码保存") |
|
|
@ApiOperation("办理/扫码保存") |
|
|
@PostMapping("/saveInventoryInfo") |
|
|
@PostMapping("/saveInventoryInfo") |
|
|
@ResponseBody |
|
|
@ResponseBody |
|
|
ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto){ |
|
|
ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto) { |
|
|
return wmsInventoryCheckbillService.saveInventoryInfo(dto); |
|
|
return wmsInventoryCheckbillService.saveInventoryInfo(dto); |
|
|
}; |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation("扫描商品码") |
|
|
|
|
|
@GetMapping("/scan") |
|
|
|
|
|
@ResponseBody |
|
|
|
|
|
public ResultBean<HandleBean> scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid) { |
|
|
|
|
|
return wmsInventoryCheckbillService.scan(sid, content, houseSid); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
/*********************************************************流程************************************************************/ |
|
|
/*********************************************************流程************************************************************/ |
|
|
|
|
|
|
|
|