From ddcd0fe9d7d0faf638246bc6a07e14dcd58b75fb Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 18 Apr 2025 16:26:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/portal/biz/index/AppIndexEnum.java | 1 + .../portal/biz/index/AppIndexService.java | 8 + .../fegin/wms/WmsInventoryCheckbillFeign.java | 26 + .../WmsInventoryCheckbillService.java | 2 + .../WmsInventoryAllocatebillRest.java | 184 +++--- .../WmsInventoryCheckbillDetailRest.java | 13 - .../WmsInventoryCheckbillReportRest.java | 13 - .../inventroy/WmsInventoryCheckbillRest.java | 8 + .../wmsinventory/WmsInventoryMapper.xml | 2 + .../wmsinventory/WmsInventoryService.java | 26 +- .../WmsInventoryCheckbillMapper.java | 35 +- .../WmsInventoryCheckbillMapper.xml | 569 ++++++++++-------- .../WmsInventoryCheckbillService.java | 23 +- .../WmsInventoryCheckbillDetailMapper.java | 20 +- .../WmsInventoryCheckbillDetailMapper.xml | 306 +++++----- 15 files changed, 646 insertions(+), 590 deletions(-) create mode 100644 anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsInventoryCheckbillFeign.java diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java index 45002fafdd..4b97c73ec6 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexEnum.java @@ -57,6 +57,7 @@ public class AppIndexEnum { WXWB("c3a6be91-3e95-4520-b5a7-c805d8f187d7", "维修完毕"), SPSJ("781ce38b-b003-4efd-accf-fbee0ca33091", "商品上架"), PJJS("37905444-5454-4b08-897d-6c2c089c317d", "配件接收"), + SPPD("a16641b1-e34e-4c80-9163-7eed9893c3c5", "商品盘点"), ; /** diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java index ccbf4534bf..f6b863818b 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexService.java @@ -19,6 +19,7 @@ import com.yxt.anrui.portal.biz.sysuser.SysUserService; import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService; import com.yxt.anrui.portal.fegin.as.AsBusrepairBillFeign; import com.yxt.anrui.portal.fegin.as.AsToDoNumQuery; +import com.yxt.anrui.portal.fegin.wms.WmsInventoryCheckbillFeign; import com.yxt.anrui.portal.fegin.wms.WmsShelfBillFeign; import com.yxt.anrui.portal.fegin.wms.WmsToDoNumQuery; import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign; @@ -81,6 +82,8 @@ public class AppIndexService { @Resource private WmsShelfBillFeign wmsShelfBillFeign; @Resource + private WmsInventoryCheckbillFeign wmsInventoryCheckbillFeign; + @Resource private AsBusrepairBillFeign asBusrepairBillFeign; public ResultBean> getBusinessList(String userSid, String appSid, String orgPath) { @@ -250,6 +253,11 @@ public class AppIndexService { String num = asBusrepairBillFeign.getToDoNum2(asToDoNumQuery).getData(); appIndexNumVo.setNum(num); } + //商品盘点 + if (AppIndexEnum.AppMenu.SPPD.getRemarks().equals(menu.getTitle())) { + String num = wmsInventoryCheckbillFeign.getToDoNum(wmsToDoNumQuery).getData(); + appIndexNumVo.setNum(num); + } list.add(appIndexNumVo); } } diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsInventoryCheckbillFeign.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsInventoryCheckbillFeign.java new file mode 100644 index 0000000000..621b5fb150 --- /dev/null +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/fegin/wms/WmsInventoryCheckbillFeign.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.portal.fegin.wms; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * @description: 商品盘点 + * @author: fzz + * @date: 2024/3/7 + **/ +@FeignClient( + contextId = "yxt-wms-WmsInventoryCheckbill", + name = "yxt-wms", + path = "v1/wmsinventorycheckbill" +) +public interface WmsInventoryCheckbillFeign { + + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum") + @ResponseBody + ResultBean getToDoNum(@SpringQueryMap WmsToDoNumQuery wmsToDoNumQuery); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java index 2f49b59340..0dfd7d48a5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java @@ -94,6 +94,8 @@ public class WmsInventoryCheckbillService { if (record.getLossCount() != null){ wmsInventoryCheckbillGoodsPageVo.setPanSun(record.getLossCount().toString()); handleBean.setBadNum(record.getLossCount().toString()); + }else { + handleBean.setBadNum("0"); } List fileList = record.getFileList(); List files = new ArrayList<>(); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java index ef5badacf3..cfb46cc8ff 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java @@ -46,99 +46,99 @@ import java.util.List; @RequestMapping("/apiadmin/inventory/wmsinventoryallocatebill") public class WmsInventoryAllocatebillRest { - @Autowired - private WmsInventoryAllocateBillService wmsInventoryAllocateBillService; - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = wmsInventoryAllocateBillService.listPageVo(pq); - return rb.success().setData(pv); - } - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryAllocateBillService.saveOrUpdateDto(dto); - return rb.success(); - } - - @ApiOperation("根据sid批量删除") + @Autowired + private WmsInventoryAllocateBillService wmsInventoryAllocateBillService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = wmsInventoryAllocateBillService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto) { + ResultBean rb = ResultBean.fireFail(); + wmsInventoryAllocateBillService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("根据sid批量删除") @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - wmsInventoryAllocateBillService.delAll(sids); - return rb.success(); - } + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + wmsInventoryAllocateBillService.delAll(sids); + return rb.success(); + } - @ApiOperation("根据SID获取一条记录") + @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchDetailsBySid/{sid}") - public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid); - return rb.success().setData(vo); - } - - /*********************************************************流程************************************************************/ - - @ApiOperation("提交") - @PostMapping("/submitApply") - public ResultBean submitApply(@Valid @RequestBody SubmitFlowDto dto) { - return wmsInventoryAllocateBillService.submitApply(dto); - } - - @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - public ResultBean complete(@Valid @RequestBody CompleteFlowDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(""); - return wmsInventoryAllocateBillService.complete(bv); - } - - @ApiOperation(value = "获取上一个环节") - @GetMapping(value = "/getPreviousNodesForReject") - ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap FlowNodeQuery query) { - return wmsInventoryAllocateBillService.getPreviousNodesForReject(query); - } - - @ApiOperation(value = "获取下一个环节") - @GetMapping(value = "/getNextNodesForSubmit") - ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap FlowNodeQuery query) { - return wmsInventoryAllocateBillService.getNextNodesForSubmit(query); - } - - @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") - public ResultBean taskReject(@Valid @RequestBody FlowTaskQuery query) { - return wmsInventoryAllocateBillService.taskReject(query); - } - - @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") - public ResultBean revokeProcess(@Valid @RequestBody FlowTaskQuery query) { - return wmsInventoryAllocateBillService.revokeProcess(query); - } - - @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") - public ResultBean breakProcess(@Valid @RequestBody FlowTaskQuery query) { - return wmsInventoryAllocateBillService.breakProcess(query); - } - - @ApiOperation(value = "加签") - @PostMapping(value = "/delegate") - @ResponseBody - public ResultBean delegate(@RequestBody FlowDelegateQuery query) { - return wmsInventoryAllocateBillService.delegate(query); - } - - @ApiOperation(value = "转办") - @PostMapping(value = "/assignTask") - @ResponseBody - public ResultBean assignTask(@RequestBody FlowDelegateQuery query){ - return wmsInventoryAllocateBillService.assignTask(query); - } + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } + + /*********************************************************流程************************************************************/ + + @ApiOperation("提交") + @PostMapping("/submitApply") + public ResultBean submitApply(@Valid @RequestBody SubmitFlowDto dto) { + return wmsInventoryAllocateBillService.submitApply(dto); + } + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteFlowDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(""); + return wmsInventoryAllocateBillService.complete(bv); + } + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap FlowNodeQuery query) { + return wmsInventoryAllocateBillService.getPreviousNodesForReject(query); + } + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap FlowNodeQuery query) { + return wmsInventoryAllocateBillService.getNextNodesForSubmit(query); + } + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@Valid @RequestBody FlowTaskQuery query) { + return wmsInventoryAllocateBillService.taskReject(query); + } + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody FlowTaskQuery query) { + return wmsInventoryAllocateBillService.revokeProcess(query); + } + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody FlowTaskQuery query) { + return wmsInventoryAllocateBillService.breakProcess(query); + } + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody FlowDelegateQuery query) { + return wmsInventoryAllocateBillService.delegate(query); + } + + @ApiOperation(value = "转办") + @PostMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody FlowDelegateQuery query) { + return wmsInventoryAllocateBillService.assignTask(query); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java index ba3a851856..d284a30ccb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillDetailRest.java @@ -28,19 +28,6 @@ package com.yxt.wms.apiadmin.inventroy; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.*; -/** - * Project: yxt-wms(仓储)
- * File: WmsInventoryCheckbillDetailFeignFallback.java
- * Class: com.yxt.wms.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRest
- * Description: 库存盘点-明细.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-22 09:25:02
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "库存盘点-明细") @RestController @RequestMapping("v1/wmsinventorycheckbilldetail") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java index 10c8f4141f..fa61ed53da 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillReportRest.java @@ -28,19 +28,6 @@ package com.yxt.wms.apiadmin.inventroy; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.*; -/** - * Project: yxt-wms(盘点报告)
- * File: WmsInventoryCheckbillReportFeignFallback.java
- * Class: com.yxt.wms.biz.wmsinventorycheckbillreport.WmsInventoryCheckbillReportRest
- * Description: 盘点报告.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-07-19 09:52:51
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "盘点报告") @RestController @RequestMapping("v1/wmsinventorycheckbillreport") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index 1860008812..5a1edd628b 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java @@ -34,6 +34,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDetailsVo; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsToDoNumQuery; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -159,6 +160,13 @@ public class WmsInventoryCheckbillRest { return wmsInventoryCheckbillService.scan(sid, content, houseSid); } + @ApiOperation("手机端-查询本分公司下代办数量:切换机构") + @GetMapping("/getToDoNum") + @ResponseBody + ResultBean getToDoNum(@SpringQueryMap WmsToDoNumQuery wmsToDoNumQuery) { + return wmsInventoryCheckbillService.getToDoNum(wmsToDoNumQuery); + } + /*********************************************************流程************************************************************/ @ApiOperation("提交") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index c8a84341b0..e37b63fe46 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -297,6 +297,8 @@ ON wr.locationSid = wa.sid LEFT JOIN wms_warehouse_zone wz ON wz.warehouseSid = wi.warehouseSid + LEFT JOIN wms_warehouse_info wwi + ON wwi.sid = wi.warehouseSid ${ew.sqlSegment} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java index ac20cec993..1aa3e55c49 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java @@ -136,7 +136,7 @@ public class WmsInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -213,7 +213,7 @@ public class WmsInventoryService extends MybatisBaseService list = baseMapper.listExcel(qw); list.removeAll(Collections.singleton(null)); return list; @@ -574,6 +574,8 @@ public class WmsInventoryService extends MybatisBaseService qw = new QueryWrapper<>(); qw.eq("wi.useOrgSid", query.getDeptSid()); + qw.eq("wwi.warehouseTypeKey", "01"); + qw.gt("wi.count", 0); if (StringUtils.isNotBlank(query.getGoodsID())) { qw.like("wi.goodsID", query.getGoodsID()); } @@ -947,8 +949,8 @@ public class WmsInventoryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.fittingsInventory(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -1007,8 +1009,8 @@ public class WmsInventoryService extends MybatisBaseService listVos = baseMapper.appStorage(qw); Map> stringListMap = listVos.stream().collect(Collectors.groupingBy(StorageListVo::getTitle)); List records = new ArrayList<>(); @@ -1374,7 +1376,7 @@ public class WmsInventoryService extends MybatisBaseService oaInventoryList(String orgPath, String warehouseTypeValue,String name) { + public List oaInventoryList(String orgPath, String warehouseTypeValue, String name) { List list = new ArrayList<>(); String useOrgSid = ""; if (StringUtils.isNotBlank(orgPath)) { @@ -1388,7 +1390,7 @@ public class WmsInventoryService extends MybatisBaseService inventories = baseMapper.selOaInventoryList(useOrgSid, warehouseTypeValue,name); + List inventories = baseMapper.selOaInventoryList(useOrgSid, warehouseTypeValue, name); if (!inventories.isEmpty()) { for (WmsInventory d : inventories) { FormCommon f = new FormCommon(); @@ -1402,7 +1404,7 @@ public class WmsInventoryService extends MybatisBaseService - * File: WmsInventoryCheckbillMapper.java
- * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillMapper
- * Description: 库存盘点.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-22 09:25:02
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Mapper public interface WmsInventoryCheckbillMapper extends BaseMapper { - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - IPage detailRackPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage detailRackPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - IPage detailGoodPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + IPage detailGoodPageList(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - IPage detailRackGoodPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage detailRackGoodPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); String selectNum(String billNo); - int selectBySid(String join); + int selectBySid(String join); - @Update("update wms_inventory_checkbill set state = 0,checkState = 2 where sid = #{sid}") - void createReport(String sid); + @Update("update wms_inventory_checkbill set state = 0,checkState = 2 where sid = #{sid}") + void createReport(String sid); - String checkState(@Param("deptSid") String deptSid,@Param("warehouseTypeKey") String warehouseTypeKey); + String checkState(@Param("deptSid") String deptSid, @Param("warehouseTypeKey") String warehouseTypeKey); int updateFlowFiled(Map beanToMap); IPage appDetailRackPageList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selPyByDeptSid(@Param("deptSid") String deptSid,@Param("warehouseTypeKey") String warehouseTypeKey); + List selPyByDeptSid(@Param("deptSid") String deptSid, @Param("warehouseTypeKey") String warehouseTypeKey); - List selPkByDeptSid(@Param("deptSid") String deptSid,@Param("warehouseTypeKey") String warehouseTypeKey); + List selPkByDeptSid(@Param("deptSid") String deptSid, @Param("warehouseTypeKey") String warehouseTypeKey); + + int getToDoNum(String userSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 72949a3fa6..c66152c667 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -1,285 +1,322 @@ - - - + + + - + - + - + - + select RIGHT (billNo, 4) + from wms_inventory_checkbill + where billNo LIKE concat(#{billNo}, '%') + order by billNo desc + limit 1 - + SELECT COUNT(*) + FROM wms_inventory_checkbill + WHERE nodeState != '待提交' and find_in_set(sid, #{list}) - + - + - - UPDATE wms_inventory_checkbill - SET nodeState=#{nodeState}, nodeId=#{taskDefKey} - - , finishTime = NOW() - - - , procDefId=#{procDefId} - - - , procInstId=#{procInsId} - - - , taskId=#{taskId} - - WHERE sid=#{sid} + + UPDATE wms_inventory_checkbill + SET nodeState=#{nodeState}, nodeId=#{taskDefKey} + + , finishTime = NOW() + + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} - - + - + + + \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 1114dee0b9..292a5405c1 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -50,6 +50,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitin; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; +import com.yxt.wms.biz.inventory.wmsshelfbill.WmsToDoNumQuery; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import com.yxt.wms.feign.flowable.flow.FlowableFeign; import com.yxt.wms.feign.flowable.flow.ProcDefEnum; @@ -85,19 +86,6 @@ import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; -/** - * Project: yxt-wms(仓储)
- * File: WmsInventoryCheckbillService.java
- * Class: com.yxt.wms.biz.wmsinventorycheckbill.WmsInventoryCheckbillService
- * Description: 库存盘点 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-03-22 09:25:02
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class WmsInventoryCheckbillService extends MybatisBaseService { @@ -940,7 +928,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService selPkByDeptSid(String deptSid,String warehouseTypeKey) { return baseMapper.selPkByDeptSid(deptSid,warehouseTypeKey); } + + public ResultBean getToDoNum(WmsToDoNumQuery wmsToDoNumQuery) { + ResultBean rb = ResultBean.fireFail(); + String userSid = wmsToDoNumQuery.getUserSid(); + int count = baseMapper.getToDoNum(userSid); + return rb.success().setData(String.valueOf(count)); + } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java index e9b98181c5..462b808477 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java @@ -54,26 +54,26 @@ import java.util.List; @Mapper public interface WmsInventoryCheckbillDetailMapper extends BaseMapper { - @Delete("delete from wms_inventory_checkbill_detail where billSid = #{dtoSid}") - void delByMainSid(String dtoSid); + @Delete("delete from wms_inventory_checkbill_detail where billSid = #{dtoSid}") + void delByMainSid(String dtoSid); - List selByMainSid(String billSid); + List selByMainSid(String billSid); WmsInventoryCheckbillReportSumVo reportSumTotal(String billSid); - List reportSumWare(String billSid); + List reportSumWare(String billSid); - List reportSumArea(String billSid); + List reportSumArea(String billSid); - void saveInventoryInfoZC(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("num") String num); + void saveInventoryInfoZC(@Param("dto") WmsInventoryCheckbillGoodsDto dto, @Param("num") String num); - void saveInventoryInfoPY(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("pyCount") BigDecimal pyCount); + void saveInventoryInfoPY(@Param("dto") WmsInventoryCheckbillGoodsDto dto, @Param("pyCount") BigDecimal pyCount); - void saveInventoryInfoPK(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("pkCount") BigDecimal pkCount); + void saveInventoryInfoPK(@Param("dto") WmsInventoryCheckbillGoodsDto dto, @Param("pkCount") BigDecimal pkCount); - HandleBean scan(@Param("sid") String sid,@Param("content") String content,@Param("houseSid") String houseSid); + HandleBean scan(@Param("sid") String sid, @Param("content") String content, @Param("houseSid") String houseSid); List sourceBillBySid(String sid); - List sourceBillPkBySid(String sid); + List sourceBillPkBySid(String sid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml index 6a4c0f2267..2df2909401 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml @@ -1,162 +1,174 @@ - - - - SELECT - wicd.*, - wicd.goodsModel as carModel, - wicd.goodsSid as goodsSpuSid, - wicd.goodsName as goodsSpuName, - wicd.goodsCode as goodsSkuCode - FROM - wms_inventory_checkbill_detail wicd - LEFT JOIN wms_inventory wi - ON wicd.inventorySid = wi.`sid` - WHERE billSid = #{billSid} - + SELECT wicd.*, + wicd.goodsModel as carModel, + wicd.goodsSid as goodsSpuSid, + wicd.goodsName as goodsSpuName, + wicd.goodsCode as goodsSkuCode + FROM wms_inventory_checkbill_detail wicd + LEFT JOIN wms_inventory wi + ON wicd.inventorySid = wi.`sid` + WHERE billSid = #{billSid} + - + SELECT IFNULL(SUM(wicd.bookCount), 0) AS ypNum, + IFNULL(SUM(wicd.bookCount * cost), 0) AS ypMoney, + IFNULL(SUM(wicd.realCount), 0) AS spNum, + IFNULL(SUM(wicd.realCount * cost), 0) AS spMoney, + IFNULL(SUM(wicd.profitCount), 0) AS pyNum, + IFNULL(SUM(wicd.profitCount * cost), 0) AS pyMoney, + IFNULL(SUM(wicd.loseCount), 0) AS pkNum, + IFNULL(SUM(wicd.loseCount * cost), 0) AS pkMoney, + IFNULL(SUM(lossCount), 0) AS psNum, + IFNULL(SUM(lossCount * cost), 0) AS psMoney + FROM wms_inventory_checkbill_detail AS wicd + WHERE wicd.billSid = #{billSid} + GROUP BY wicd.billSid + - + - + - - update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = 0,remarks = #{dto.remarks},state = 2 where sid = #{dto.sid} - + + update wms_inventory_checkbill_detail + set lossCount = #{dto.badNum}, + realCount = #{dto.num}, + profitCount = 0, + loseCount = 0, + remarks = #{dto.remarks}, + state = 2 + where sid = #{dto.sid} + - - update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = #{pyCount},loseCount = 0,remarks = #{dto.remarks},state = 3 where sid = #{dto.sid} - + + update wms_inventory_checkbill_detail + set lossCount = #{dto.badNum}, + realCount = #{dto.num}, + profitCount = #{pyCount}, + loseCount = 0, + remarks = #{dto.remarks}, + state = 3 + where sid = #{dto.sid} + - - update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks},state = 4 where sid = #{dto.sid} - + + update wms_inventory_checkbill_detail + set lossCount = #{dto.badNum}, + realCount = #{dto.num}, + profitCount = 0, + loseCount = #{pkCount}, + remarks = #{dto.remarks}, + state = 4 + where sid = #{dto.sid} + - + - + - + \ No newline at end of file