diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java index 6dae632b30..7451e1b686 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.java @@ -44,4 +44,6 @@ public interface FlowTaskMapper extends BaseMapper { Map getTaskByDefKey(@Param("procId")String processInstanceId, @Param("taskId")String id); Map getActHiVarinstForOrgPath(@Param("taskId")String taskId); + + List selectAssignee(@Param("taskDefKey") String taskDefKey, @Param("procInsId") String procInsId); } diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml index 5ba94024db..195db43440 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml @@ -277,4 +277,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE ahv.task_id_= #{taskId} and ahv.name_="orgPath" order by ahv.id_ desc limit 0,1 + + \ No newline at end of file diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index a6216042b5..06863c772a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -920,7 +920,7 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); StringBuilder userName = new StringBuilder(); @@ -931,7 +931,8 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + if(!ASSIGNEE_List.isEmpty()){ + StringBuilder userName = new StringBuilder(); + for (String assignee : ASSIGNEE_List) { + ResultBean> assignee_ = sysUserFeign.fetchBySids(assignee); + List data1 = assignee_.getData(); + for (SysUserVo data : data1) { + userName.append(data.getName()).append(","); + } + } + String userName_str = ""; + userName_str = userName.substring(0, userName.length() - 1); + flowTask.setAssigneeName(userName_str); + } + //===2025-02-12添加结束 ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); @@ -1053,7 +1070,7 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); StringBuilder userName = new StringBuilder(); @@ -1064,7 +1081,7 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + if(!ASSIGNEE_List.isEmpty()){ + StringBuilder userName = new StringBuilder(); + for (String assignee : ASSIGNEE_List) { + ResultBean> assignee_ = sysUserFeign.fetchBySids(assignee); + List data1 = assignee_.getData(); + for (SysUserVo data : data1) { + userName.append(data.getName()).append(","); + } + } + String userName_str = ""; + userName_str = userName.substring(0, userName.length() - 1); + flowTask.setAssigneeName(userName_str); + } + //===2025-02-12添加结束 ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); @@ -1175,7 +1208,7 @@ public class FlowTaskService extends MybatisBaseService> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString()); StringBuilder userName = new StringBuilder(); @@ -1186,7 +1219,7 @@ public class FlowTaskService extends MybatisBaseService ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId()); + if(!ASSIGNEE_List.isEmpty()){ + StringBuilder userName = new StringBuilder(); + for (String assignee : ASSIGNEE_List) { + ResultBean> assignee_ = sysUserFeign.fetchBySids(assignee); + List data1 = assignee_.getData(); + for (SysUserVo data : data1) { + userName.append(data.getName()).append(","); + } + } + String userName_str = ""; + userName_str = userName.substring(0, userName.length() - 1); + flowTask.setAssigneeName(userName_str); + } + //===2025-02-12添加结束 ResultBean sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeFeign.java index 1138db4edc..dc9c2acdd4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeFeign.java @@ -1,10 +1,5 @@ package com.yxt.anrui.terminal.api.as.storechange; -import com.yxt.anrui.terminal.api.as.firstshelves.AppFirstShelvesDto; -import com.yxt.anrui.terminal.api.as.firstshelves.AppFirstShelvesQuery; -import com.yxt.anrui.terminal.api.as.firstshelves.AppFirstShelvesScanVo; -import com.yxt.anrui.terminal.api.as.firstshelves.AppFirstShelvesVo; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java index c7f25182da..cefe591b19 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java @@ -196,7 +196,7 @@ public class AppFirstShelvesService { wmsInventorySaveDto.setWarehouseSid(wmsHouseInfoVo.getWarehouseSid()); wmsInventorySaveDto.setWarehouseName(wmsHouseInfoVo.getWarehouseName()); wmsInventorySaveDto.setWarehouseRackSid(wmsHouseInfoVo.getWarehouseRackSid()); - wmsInventorySaveDto.setWarehouseRackCode(appFirstShelvesGoodsDto.getHouseCode()); + wmsInventorySaveDto.setWarehouseRackCode(wmsHouseInfoVo.getWarehouseRackCode()); wmsInventoryFeign.saveWmsInventory(wmsInventorySaveDto).getData(); } return rb.success(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java index ea7b1fa1ab..4151300b0c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeRest.java @@ -25,10 +25,9 @@ *********************************************************/ package com.yxt.anrui.terminal.biz.as.storechange; -import com.yxt.anrui.terminal.api.as.firstshelves.*; +import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeDto; import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeFeign; import com.yxt.anrui.terminal.api.as.storechange.AppStoreChangeScanVo; -import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; @@ -47,7 +46,7 @@ public class AppStoreChangeRest implements AppStoreChangeFeign { } @Override - public ResultBean save(AppFirstShelvesDto dto) { - return appStoreChangeService.save(dto); + public ResultBean save(AppStoreChangeDto dto) { + return null; } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java index 6feb1b7e99..366f3c6ecb 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/storechange/AppStoreChangeService.java @@ -121,7 +121,7 @@ public class AppStoreChangeService { } if (StringUtils.isBlank(storeSid)) { List wmsInventoryList = wmsInventoryFeign.selByGoodsIDAndUseOrgSid(content, deptSid).getData(); - if (wmsInventoryList.size() == 0) { + if (wmsInventoryList == null) { return rb.setMsg("当前商品不可移位"); } appStoreChangeScanVo.setType(type); @@ -129,6 +129,9 @@ public class AppStoreChangeService { appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getWarehouseSid).collect(Collectors.toList())); } else { List wmsInventoryList = wmsInventoryFeign.selByGoodsIDAndUseOrgSidAndWarehouseSid(content, deptSid, storeSid).getData(); + if (wmsInventoryList == null) { + return rb.setMsg("当前商品不可移位"); + } appStoreChangeScanVo.setType(type); appStoreChangeScanVo.setSid(wmsInventoryList.get(0).getGoodsSpuSid()); appStoreChangeScanVo.setStoreSids(wmsInventoryList.stream().map(WmsInventory::getWarehouseSid).collect(Collectors.toList())); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java index a506d0aa98..98a1281ef2 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventory/WmsInventoryFeign.java @@ -44,9 +44,9 @@ public interface WmsInventoryFeign { @ApiOperation("根据商品ID和部门sid查询") @PostMapping("/selByGoodsIDAndUseOrgSid") - ResultBean> selByGoodsIDAndUseOrgSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid); + ResultBean> selByGoodsIDAndUseOrgSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid); @ApiOperation("根据商品ID和部门sid和仓库sid查询") @PostMapping("/selByGoodsIDAndUseOrgSidAndWarehouseSid") - ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid); + ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java index f6035e1fe1..8b012f6fa6 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsH5Rest.java @@ -52,7 +52,7 @@ public class WmsH5Rest { return rb.success().setData(vo); } - @GetMapping("goods2") + @PostMapping("goods2") @ApiOperation("扫描商品标签看详情") ResultBean goods2(@RequestBody GoodsTwoQuery query) { ResultBean rb = ResultBean.fireFail(); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java index c822e2ad13..49c6d10c2f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java @@ -314,14 +314,14 @@ public class WmsInventoryRest { @ApiOperation("根据商品ID和部门sid查询") @PostMapping("/selByGoodsIDAndUseOrgSid") - ResultBean> selByGoodsIDAndUseOrgSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid) { - return wmsInventoryService.selByGoodsIDAndUseOrgSid(goodID, useOrgSid); + ResultBean> selByGoodsIDAndUseOrgSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid) { + return wmsInventoryService.selByGoodsIDAndUseOrgSid(goodsID, useOrgSid); } @ApiOperation("根据商品ID和部门sid和仓库sid查询") @PostMapping("/selByGoodsIDAndUseOrgSidAndWarehouseSid") - ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid) { - return wmsInventoryService.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodID, useOrgSid, warehouseSid); + ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid) { + return wmsInventoryService.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodsID, useOrgSid, warehouseSid); } //----------------------------- 报表 ----------------------------- diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java index 2644c27118..3fee8efb24 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java @@ -110,10 +110,10 @@ public interface WmsInventoryMapper extends BaseMapper { String selCountByGoodsID(String goodsID); @Select("select * from wms_inventory where goodsID = #{goodsID} and useOrgSid = #{useOrgSid}") - List selByGoodsIDAndUseOrgSid(@Param("goodID") String goodID, @Param("useOrgSid") String useOrgSid); + List selByGoodsIDAndUseOrgSid(@Param("goodsID") String goodsID, @Param("useOrgSid") String useOrgSid); @Select("select * from wms_inventory where goodsID = #{goodsID} and useOrgSid = #{useOrgSid} and warehouseSid = #{warehouseSid}") - List selByGoodsIDAndUseOrgSidAndWarehouseSid(@Param("goodID") String goodID, @Param("useOrgSid") String useOrgSid, @Param("warehouseSid") String warehouseSid); + List selByGoodsIDAndUseOrgSidAndWarehouseSid(@Param("goodsID") String goodsID, @Param("useOrgSid") String useOrgSid, @Param("warehouseSid") String warehouseSid); @Select("select * from wms_inventory where goodsSpuSid = #{spuSid} and useOrgSid = #{useOrgSid}") List selBySpuSidAndUseOrgSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid); 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 63c408455a..8b16b87eb2 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 @@ -1407,15 +1407,15 @@ public class WmsInventoryService extends MybatisBaseService> selByGoodsIDAndUseOrgSid(String goodID, String useOrgSid) { + public ResultBean> selByGoodsIDAndUseOrgSid(String goodsID, String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSid(goodID, useOrgSid); + List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSid(goodsID, useOrgSid); return rb.success().setData(wmsInventoryList); } - public ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(String goodID, String useOrgSid, String warehouseSid) { + public ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(String goodsID, String useOrgSid, String warehouseSid) { ResultBean rb = ResultBean.fireFail(); - List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodID, useOrgSid, warehouseSid); + List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodsID, useOrgSid, warehouseSid); return rb.success().setData(wmsInventoryList); } }