Merge remote-tracking branch 'origin/master'

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<FlowTask> {
 
     Map<String, Object> getTaskByDefKey(@Param("procId")String processInstanceId, @Param("taskId")String id);
     Map<String, Object> getActHiVarinstForOrgPath(@Param("taskId")String taskId);
+
+    List<String> selectAssignee(@Param("taskDefKey") String taskDefKey, @Param("procInsId") String procInsId);
 }

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
     </select>
+
+    <select id="selectAssignee" resultType="java.lang.String">
+        SELECT ASSIGNEE_ FROM ACT_HI_TASKINST where PROC_INST_ID_ = #{procInsId} AND TASK_DEF_KEY_ = #{taskDefKey}  and END_TIME_ is null ORDER BY START_TIME_ DESC
+    </select>
 </mapper>

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<FlowTaskMapper, FlowTask
             long time = start_time_.getTime();
             Date date = new Date(time);
             flowTask.setCreateTime(date);
-            flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
+            /*flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
             if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
                 ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
                 StringBuilder userName = new StringBuilder();
@@ -931,7 +931,8 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 String userName_str = "";
                 userName_str = userName.substring(0, userName.length() - 1);
                 flowTask.setAssigneeName(userName_str);
-            }
+            }*/
+
             flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
             flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
             flowTask.setTaskDefKey(histTask.get("taskDefKey") == null ? "" : histTask.get("taskDefKey").toString());
@@ -941,6 +942,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
             flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
+            //--2025-02-12添加开始
+            List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
+            if(!ASSIGNEE_List.isEmpty()){
+                StringBuilder userName = new StringBuilder();
+                for (String assignee : ASSIGNEE_List) {
+                    ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(assignee);
+                    List<SysUserVo> 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<SysUserVo> 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<FlowTaskMapper, FlowTask
             Date date = new Date(time);
             flowTask.setCreateTime(date);
             flowTask.setProcessCreateTime(new Date(processCreateTime1));
-            flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
+           /* flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
             if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
                 ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
                 StringBuilder userName = new StringBuilder();
@@ -1064,7 +1081,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 String userName_str = "";
                 userName_str = userName.substring(0, userName.length() - 1);
                 flowTask.setAssigneeName(userName_str);
-            }
+            }*/
 
             flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
             flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
@@ -1076,6 +1093,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
             flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
+            //--2025-02-12添加开始
+            List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
+            if(!ASSIGNEE_List.isEmpty()){
+                StringBuilder userName = new StringBuilder();
+                for (String assignee : ASSIGNEE_List) {
+                    ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(assignee);
+                    List<SysUserVo> 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<SysUserVo> 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<FlowTaskMapper, FlowTask
             Date date = new Date(time);
             flowTask.setCreateTime(date);
             flowTask.setProcessCreateTime(new Date(processCreateTime1));
-            flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
+            /*flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
             if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
                 ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());
                 StringBuilder userName = new StringBuilder();
@@ -1186,7 +1219,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 String userName_str = "";
                 userName_str = userName.substring(0, userName.length() - 1);
                 flowTask.setAssigneeName(userName_str);
-            }
+            }*/
 
             flowTask.setHasRevokeButton(userSid.equals(flowTask.getAssigneeSid()) ? true : false);
             flowTask.setProcDefId(histTask.get("PROC_DEF_ID_") == null ? "" : histTask.get("PROC_DEF_ID_").toString());
@@ -1198,6 +1231,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             flowTask.setProcDefVersion(histTask.get("PROC_DEF_VERSION_") == null ? 0 : Integer.parseInt(histTask.get("PROC_DEF_VERSION_").toString()));
             flowTask.setProcInsId(histTask.get("PROC_INST_ID_").toString());
             flowTask.setHisProcInsId(histTask.get("PROC_INST_ID_").toString());
+            //--2025-02-12添加开始
+            List<String> ASSIGNEE_List = baseMapper.selectAssignee(flowTask.getTaskDefKey(),flowTask.getProcInsId());
+            if(!ASSIGNEE_List.isEmpty()){
+                StringBuilder userName = new StringBuilder();
+                for (String assignee : ASSIGNEE_List) {
+                    ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(assignee);
+                    List<SysUserVo> 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<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(histTask.get("START_USER_ID_").toString());
             flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
             flowTask.setStartUserName(sysUserVoResultBean.getData().getName());

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;

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();

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) {
+    public ResultBean save(AppStoreChangeDto dto) {
-        return appStoreChangeService.save(dto);
+        return null;
     }
 }

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<WmsInventory> 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<WmsInventory> 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()));

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<List<WmsInventory>> selByGoodsIDAndUseOrgSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid);
+    ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid);
 
     @ApiOperation("根据商品ID和部门sid和仓库sid查询")
     @PostMapping("/selByGoodsIDAndUseOrgSidAndWarehouseSid")
-    ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid);
+    ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid);
 }

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<GoodsTwoVo> goods2(@RequestBody GoodsTwoQuery query) {
         ResultBean rb = ResultBean.fireFail();

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<List<WmsInventory>> selByGoodsIDAndUseOrgSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid) {
+    ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid) {
-        return wmsInventoryService.selByGoodsIDAndUseOrgSid(goodID, useOrgSid);
+        return wmsInventoryService.selByGoodsIDAndUseOrgSid(goodsID, useOrgSid);
     }
 
     @ApiOperation("根据商品ID和部门sid和仓库sid查询")
     @PostMapping("/selByGoodsIDAndUseOrgSidAndWarehouseSid")
-    ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodID") String goodID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid) {
+    ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSidAndWarehouseSid(@RequestParam("goodsID") String goodsID, @RequestParam("useOrgSid") String useOrgSid, @RequestParam("warehouseSid") String warehouseSid) {
-        return wmsInventoryService.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodID, useOrgSid, warehouseSid);
+        return wmsInventoryService.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodsID, useOrgSid, warehouseSid);
     }
 
     //-----------------------------  报表 -----------------------------

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@@ -110,10 +110,10 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
     String selCountByGoodsID(String goodsID);
 
     @Select("select * from wms_inventory where goodsID = #{goodsID} and useOrgSid = #{useOrgSid}")
-    List<WmsInventory> selByGoodsIDAndUseOrgSid(@Param("goodID") String goodID, @Param("useOrgSid") String useOrgSid);
+    List<WmsInventory> selByGoodsIDAndUseOrgSid(@Param("goodsID") String goodsID, @Param("useOrgSid") String useOrgSid);
 
     @Select("select * from wms_inventory where goodsID = #{goodsID} and useOrgSid = #{useOrgSid} and warehouseSid = #{warehouseSid}")
-    List<WmsInventory> selByGoodsIDAndUseOrgSidAndWarehouseSid(@Param("goodID") String goodID, @Param("useOrgSid") String useOrgSid, @Param("warehouseSid") String warehouseSid);
+    List<WmsInventory> 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<WmsInventory> selBySpuSidAndUseOrgSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -1407,15 +1407,15 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         return rb.success().setData(count);
     }
 
-    public ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSid(String goodID, String useOrgSid) {
+    public ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSid(String goodsID, String useOrgSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsInventory> wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSid(goodID, useOrgSid);
+        List<WmsInventory> wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSid(goodsID, useOrgSid);
         return rb.success().setData(wmsInventoryList);
     }
 
-    public ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSidAndWarehouseSid(String goodID, String useOrgSid, String warehouseSid) {
+    public ResultBean<List<WmsInventory>> selByGoodsIDAndUseOrgSidAndWarehouseSid(String goodsID, String useOrgSid, String warehouseSid) {
         ResultBean rb = ResultBean.fireFail();
-        List<WmsInventory> wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodID, useOrgSid, warehouseSid);
+        List<WmsInventory> wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodsID, useOrgSid, warehouseSid);
         return rb.success().setData(wmsInventoryList);
     }
 }