From 40f53bdf7196484368392f8d85359b67845d3235 Mon Sep 17 00:00:00 2001 From: ligaode Date: Wed, 12 Feb 2025 11:15:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/as/storechange/AppStoreChangeDto.java | 23 + .../as/storechange/AppStoreChangeFeign.java | 4 +- .../yxt/wms/apiadmin/inventroy/WmsH5Rest.java | 8 +- .../wmsinventory/WmsInventoryMapper.java | 31 +- .../wmsinventory/WmsInventoryMapper.xml | 449 ++++++++++-------- .../wmsinventory/WmsInventoryService.java | 93 +++- .../wmsinventory/appH5/GoodsTwoListVo.java | 48 ++ .../wmsinventory/appH5/GoodsTwoQuery.java | 28 ++ .../wmsinventory/appH5/GoodsTwoVo.java | 41 ++ 9 files changed, 487 insertions(+), 238 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeDto.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoQuery.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoVo.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeDto.java new file mode 100644 index 0000000000..ce255fd5ac --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/storechange/AppStoreChangeDto.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.terminal.api.as.storechange; + +import com.yxt.anrui.terminal.api.as.firstshelves.AppFirstShelvesGoodsDto; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppStoreChangeDto implements Dto { + + @ApiModelProperty("库存sid") + private String sid; + @ApiModelProperty("移位数量") + private String count; + @ApiModelProperty("移位仓库") + private String houseInfo2; + @ApiModelProperty("移位库位编码") + private String houseCode2; + @ApiModelProperty("移位仓库") + private String store; +} 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 a9b4ebb553..1138db4edc 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 @@ -26,9 +26,9 @@ public interface AppStoreChangeFeign { @ResponseBody public ResultBean scan(@RequestParam("content") String content, @RequestParam("type") String type, @RequestParam("orgPath") String orgPath, @RequestParam(value = "storeSid", required = false) String storeSid); - @ApiOperation("上架保存") + @ApiOperation("保存") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody AppFirstShelvesDto dto); + public ResultBean save(@RequestBody AppStoreChangeDto dto); } 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 90ea8a27eb..f6035e1fe1 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 @@ -5,6 +5,8 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.wms.biz.inventory.wmsgoodstag.app.AppTagInit; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTwoQuery; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTwoVo; import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -52,9 +54,9 @@ public class WmsH5Rest { @GetMapping("goods2") @ApiOperation("扫描商品标签看详情") - ResultBean goods2(@RequestParam("sid") String sid) { - ResultBean rb = ResultBean.fireFail(); - GoodsTagH5Vo vo = wmsInventoryService.scanGoodsTag(sid); + ResultBean goods2(@RequestBody GoodsTwoQuery query) { + ResultBean rb = ResultBean.fireFail(); + GoodsTwoVo vo = wmsInventoryService.goods2(query); if (null == vo) { return rb.fail().setMsg("商品不存在"); } 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 93fe6e4f48..2644c27118 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 @@ -44,9 +44,9 @@ public interface WmsInventoryMapper extends BaseMapper { IPage listPageSales(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage getPackageGoodsVo(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage getPackageGoodsVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage inventoryAgeList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage inventoryAgeList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List ageExportExcel(@Param(Constants.WRAPPER) QueryWrapper qw); @@ -72,13 +72,13 @@ public interface WmsInventoryMapper extends BaseMapper { List selByDeptSid(String deptSid); - List selByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List rackSids); + List selByDeptSidAndRackSid(@Param("deptSid") String deptSid, @Param("rackSids") List rackSids); - IPage selInvenGoodsByUseOrgSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage selInvenGoodsByUseOrgSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage returnFactGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selBillNoAndCode(@Param("sourceBillNo") String sourceBillNo,@Param("goodsSkuCode") String goodsSkuCode,@Param("deptSid") String deptSid); + List selBillNoAndCode(@Param("sourceBillNo") String sourceBillNo, @Param("goodsSkuCode") String goodsSkuCode, @Param("deptSid") String deptSid); IPage fittingsInventory(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); @@ -86,32 +86,37 @@ public interface WmsInventoryMapper extends BaseMapper { List appOldStorage(@Param(Constants.WRAPPER) QueryWrapper qw); - List selJJByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List rackSids); + List selJJByDeptSidAndRackSid(@Param("deptSid") String deptSid, @Param("rackSids") List rackSids); List selJJByDeptSid(String deptSid); WmsInventory selbyGoodsId(@Param("goodsID") String goodsID); - IPage deadStockList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + IPage deadStockList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - String selByGoodsIdAndRackSid(@Param("goodsID") String goodsID,@Param("warehouseRackSid") String warehouseRackSid); + String selByGoodsIdAndRackSid(@Param("goodsID") String goodsID, @Param("warehouseRackSid") String warehouseRackSid); BigDecimal compute(String skuSid); - List selCJByDeptSidAndRackSid(@Param("deptSid") String deptSid,@Param("rackSids") List rackSids); + List selCJByDeptSidAndRackSid(@Param("deptSid") String deptSid, @Param("rackSids") List rackSids); List selCJByDeptSid(String deptSid); - IPage inventoryStockList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage inventoryStockList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - List selOaInventoryList(@Param("useOrgSid")String useOrgSid, @Param("warehouseTypeValue")String warehouseTypeValue); + List selOaInventoryList(@Param("useOrgSid") String useOrgSid, @Param("warehouseTypeValue") String warehouseTypeValue); @Select("select count from wms_inventory where goodsID = #{goodsID}") 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("goodID") String goodID, @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("goodID") String goodID, @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); + + List selBySpuSidAndUseOrgSidWarehouseSid(@Param("spuSid") String spuSid, @Param("useOrgSid") String useOrgSid, @Param("warehouseSid") String warehouseSid, @Param("sids") List sids); } 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 1bf2f115ef..183ac3a17d 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 @@ -209,7 +209,9 @@ DATEDIFF(NOW(), w.firstInDate) as age FROM wms_inventory as w, ( SELECT @rank := 0 ) t - ${ew.sqlSegment} + + ${ew.sqlSegment} + SELECT * FROM - (SELECT - e.*, - ( - SELECT - CONCAT( v.vinNo, '/', v.vehMark ) - FROM - yxt_4sas.as_busrepair_inventorybill_detail AS d - LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid - LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid - WHERE - d.oldInventorySid = e.sid - LIMIT 1 - ) carCodeInfo, - ( - SELECT - b.billNo - FROM - yxt_4sas.as_busrepair_inventorybill_detail AS d - LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid - LEFT JOIN yxt_4sas.as_busrepair_bill AS b ON i.sourceBillSid = b.sid - WHERE - d.oldInventorySid = e.sid - LIMIT 1 - ) repairId - FROM - ( - SELECT - i.count, - i.manufacturerName factory, - i.goodsID, - i.goodsSkuCode, - i.goodsSkuOwnSpec, - i.goodsSpuName, - DATEDIFF( NOW(), i.firstInDate ) inventoryAge, - i.cost price, - i.unit, - CONCAT( i.warehouseName, '-', a.areaName, '-', i.warehouseRackCode ) title, - i.sid, - s.orgSidPath, - i.createBySid - FROM - wms_inventory AS i - LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid - LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid - LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid - LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid - ) e) a + (SELECT + e.*, + ( + SELECT + CONCAT( v.vinNo, '/', v.vehMark ) + FROM + yxt_4sas.as_busrepair_inventorybill_detail AS d + LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid + LEFT JOIN yxt_4sas.as_busrepair_bill_vech AS v ON i.sourceBillSid = v.billSid + WHERE + d.oldInventorySid = e.sid + LIMIT 1 + ) carCodeInfo, + ( + SELECT + b.billNo + FROM + yxt_4sas.as_busrepair_inventorybill_detail AS d + LEFT JOIN yxt_4sas.as_busrepair_inventorybill AS i ON d.billSid = i.sid + LEFT JOIN yxt_4sas.as_busrepair_bill AS b ON i.sourceBillSid = b.sid + WHERE + d.oldInventorySid = e.sid + LIMIT 1 + ) repairId + FROM + ( + SELECT + i.count, + i.manufacturerName factory, + i.goodsID, + i.goodsSkuCode, + i.goodsSkuOwnSpec, + i.goodsSpuName, + DATEDIFF( NOW(), i.firstInDate ) inventoryAge, + i.cost price, + i.unit, + CONCAT( i.warehouseName, '-', a.areaName, '-', i.warehouseRackCode ) title, + i.sid, + s.orgSidPath, + i.createBySid + FROM + wms_inventory AS i + LEFT JOIN wms_warehouse_rack AS r ON i.warehouseRackSid = r.sid + LEFT JOIN wms_warehouse_area AS a ON r.locationSid = a.sid + LEFT JOIN wms_warehouse_info AS w ON i.warehouseSid = w.sid + LEFT JOIN anrui_portal.sys_organization AS s ON i.useOrgSid = s.sid + ) e) a ${ew.sqlSegment} @@ -564,41 +561,39 @@ SELECT wi.* FROM wms_inventory wi - LEFT JOIN wms_warehouse_info wwi - ON wi.warehouseSid = wwi.sid + LEFT JOIN wms_warehouse_info wwi + ON wi.warehouseSid = wwi.sid WHERE wi.count > 0 AND wwi.useOrgSid = #{deptSid} AND wwi.warehouseTypeKey = '02' - AND RIGHT(wi.goodsID,2) = '-O' + AND RIGHT (wi.goodsID + , 2) = '-O' SELECT * FROM - (SELECT - s.orgSidPath, - so.name useOrgName, - s.name deptName, - i.goodsSpuName, - i.goodsSkuCode, - i.manufacturerName, - i.supplierName, - IFNULL(SUM(count),0) count, - DATEDIFF(NOW(),(SELECT MIN(wi.firstInDate) FROM wms_inventory as wi WHERE wi.count > 0 and wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid)) inventoryAge, - date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.busTypeValue = '销售出库'),'%Y-%m-%d') salesTime, - DATEDIFF(NOW(),(date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.busTypeValue = '销售出库'),'%Y-%m-%d'))) noSalesDays, - date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.billType = '1'),'%Y-%m-%d') storageTime, - SUM(IFNULL(i.cost,0) * IFNULL(i.count,0)) totalCost, - FORMAT((SUM(IFNULL(i.cost,0) * IFNULL(i.count,0))/IFNULL(SUM(count),0)),2) avgPrice - FROM - wms_inventory as i - LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid - LEFT JOIN anrui_portal.sys_organization as so ON i.createOrgSid = so.sid - WHERE i.count > 0 - GROUP BY i.goodsSkuSid,i.goodsSkuCode,i.useOrgSid,i.manufacturerSid,i.supplierSid) m + (SELECT + s.orgSidPath, + so.name useOrgName, + s.name deptName, + i.goodsSpuName, + i.goodsSkuCode, + i.manufacturerName, + i.supplierName, + IFNULL(SUM(count),0) count, + DATEDIFF(NOW(),(SELECT MIN(wi.firstInDate) FROM wms_inventory as wi WHERE wi.count > 0 and wi.useOrgSid = + i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = + i.supplierSid)) inventoryAge, + date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on + r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and + wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.busTypeValue = + '销售出库'),'%Y-%m-%d') salesTime, + DATEDIFF(NOW(),(date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as + wi on r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and + wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.busTypeValue = + '销售出库'),'%Y-%m-%d'))) noSalesDays, + date_format ((SELECT MAX(r.createTime) FROM wms_inventory_record as r LEFT JOIN wms_inventory as wi on + r.inventorySid = wi.sid WHERE wi.useOrgSid = i.useOrgSid and wi.goodsSkuCode = i.goodsSkuCode and + wi.manufacturerSid = i.manufacturerSid and wi.supplierSid = i.supplierSid and r.billType = '1'),'%Y-%m-%d') + storageTime, + SUM(IFNULL(i.cost,0) * IFNULL(i.count,0)) totalCost, + FORMAT((SUM(IFNULL(i.cost,0) * IFNULL(i.count,0))/IFNULL(SUM(count),0)),2) avgPrice + FROM + wms_inventory as i + LEFT JOIN anrui_portal.sys_organization as s ON i.useOrgSid = s.sid + LEFT JOIN anrui_portal.sys_organization as so ON i.createOrgSid = so.sid + WHERE i.count > 0 + GROUP BY i.goodsSkuSid,i.goodsSkuCode,i.useOrgSid,i.manufacturerSid,i.supplierSid) m ${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 19bcab7035..48dc8e6f93 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 @@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsinventory; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; @@ -12,10 +13,7 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.base.wmswarehouserack.WmsHouseInfoVo; import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService; -import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsListTagH5Vo; -import com.yxt.wms.biz.inventory.wmsinventory.appH5.GoodsTagH5Vo; -import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackH5Vo; -import com.yxt.wms.biz.inventory.wmsinventory.appH5.HouseRackListVo; +import com.yxt.wms.biz.inventory.wmsinventory.appH5.*; import com.yxt.wms.biz.inventory.wmsinventory.appInventory.*; import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockQuery; import com.yxt.wms.biz.inventory.wmsinventory.report.DeadStockVo; @@ -59,6 +57,7 @@ public class WmsInventoryService extends MybatisBaseService listPage(PagerQuery pq) { WmsInventoryQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); @@ -739,6 +738,72 @@ public class WmsInventoryService extends MybatisBaseService split = Arrays.asList(query.getOrgPath().split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + deptSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + deptSid = sysOrganization.getSid(); + } + if (StringUtils.isBlank(query.getStoreSid())) { + List wmsInventoryList = baseMapper.selBySpuSidAndUseOrgSid(query.getSid(), deptSid); + goodsTwoVo.setGoodsName(wmsInventoryList.get(0).getGoodsSkuTitle()); + goodsTwoVo.setNumId(wmsInventoryList.get(0).getGoodsSkuCode()); + goodsTwoVo.setProvider(wmsInventoryList.get(0).getSupplierName()); + goodsTwoVo.setInboundTime(DateUtil.formatDate(wmsInventoryList.get(0).getFirstInDate())); + goodsTwoVo.setGoodsSkuOwnSpec(wmsInventoryList.get(0).getGoodsSkuOwnSpec()); + goodsTwoVo.setUnit(wmsInventoryList.get(0).getUnit()); + List list = new ArrayList<>(); + for (WmsInventory wmsInventory : wmsInventoryList) { + GoodsTwoListVo goodsTwoListVo = new GoodsTwoListVo(); + goodsTwoListVo.setSid(wmsInventory.getSid()); + goodsTwoListVo.setGoodsName(wmsInventory.getGoodsSkuTitle()); + goodsTwoListVo.setNumId(wmsInventory.getGoodsSkuCode()); + goodsTwoListVo.setStore(wmsInventory.getWarehouseName()); + goodsTwoListVo.setStoreSid(wmsInventory.getWarehouseSid()); + goodsTwoListVo.setCount(wmsInventory.getCount().toString()); + goodsTwoListVo.setMaxCount(wmsInventory.getCount().toString()); + goodsTwoListVo.setHouseInfo("保内-" + wmsInventory.getWarehouseName() + " " + wmsInventory.getWarehouseRackCode()); + if (wmsInventory.getCount().compareTo(BigDecimal.ONE) == 0) { + goodsTwoListVo.setForbid(true); + } + list.add(goodsTwoListVo); + } + goodsTwoVo.setList(list); + return goodsTwoVo; + } + List wmsInventoryList = baseMapper.selBySpuSidAndUseOrgSidWarehouseSid(query.getSid(), deptSid, query.getStoreSid(), query.getSids()); + goodsTwoVo.setGoodsName(wmsInventoryList.get(0).getGoodsSkuTitle()); + goodsTwoVo.setNumId(wmsInventoryList.get(0).getGoodsSkuCode()); + goodsTwoVo.setProvider(wmsInventoryList.get(0).getSupplierName()); + goodsTwoVo.setInboundTime(DateUtil.formatDate(wmsInventoryList.get(0).getFirstInDate())); + goodsTwoVo.setGoodsSkuOwnSpec(wmsInventoryList.get(0).getGoodsSkuOwnSpec()); + goodsTwoVo.setUnit(wmsInventoryList.get(0).getUnit()); + List list = new ArrayList<>(); + for (WmsInventory wmsInventory : wmsInventoryList) { + GoodsTwoListVo goodsTwoListVo = new GoodsTwoListVo(); + goodsTwoListVo.setSid(wmsInventory.getSid()); + goodsTwoListVo.setGoodsName(wmsInventory.getGoodsSkuTitle()); + goodsTwoListVo.setNumId(wmsInventory.getGoodsSkuCode()); + goodsTwoListVo.setStore(wmsInventory.getWarehouseName()); + goodsTwoListVo.setStoreSid(wmsInventory.getWarehouseSid()); + goodsTwoListVo.setCount(wmsInventory.getCount().toString()); + goodsTwoListVo.setMaxCount(wmsInventory.getCount().toString()); + goodsTwoListVo.setHouseInfo("保内-" + wmsInventory.getWarehouseName() + " " + wmsInventory.getWarehouseRackCode()); + if (wmsInventory.getCount().compareTo(BigDecimal.ONE) == 0) { + goodsTwoListVo.setForbid(true); + } + list.add(goodsTwoListVo); + } + goodsTwoVo.setList(list); + return goodsTwoVo; + } + public List selByDeptSid(String deptSid) { return baseMapper.selByDeptSid(deptSid); } @@ -1300,7 +1365,7 @@ public class WmsInventoryService extends MybatisBaseService inventories = baseMapper.selOaInventoryList(useOrgSid,warehouseTypeValue); + List inventories = baseMapper.selOaInventoryList(useOrgSid, warehouseTypeValue); if (!inventories.isEmpty()) { for (WmsInventory d : inventories) { FormCommon f = new FormCommon(); @@ -1308,26 +1373,26 @@ public class WmsInventoryService extends MybatisBaseService extra = new HashMap<>(); if (null != d.getCount()) { - extra.put("count",d.getCount().toString()); + extra.put("count", d.getCount().toString()); } if (StringUtils.isNotBlank(d.getGoodsSkuOwnSpec())) { - extra.put("goodsSkuOwnSpec",d.getGoodsSkuOwnSpec()); + extra.put("goodsSkuOwnSpec", d.getGoodsSkuOwnSpec()); } if (StringUtils.isNotBlank(d.getGoodsSkuSid())) { - extra.put("goodsSkuSid",d.getGoodsSkuSid()); + extra.put("goodsSkuSid", d.getGoodsSkuSid()); } if (StringUtils.isNotBlank(d.getGoodsSpuSid())) { - extra.put("goodsSpuSid",d.getGoodsSpuSid()); + extra.put("goodsSpuSid", d.getGoodsSpuSid()); } if (StringUtils.isNotBlank(d.getUnit())) { - extra.put("unit",d.getUnit()); + extra.put("unit", d.getUnit()); } if (warehouseTypeValue.equals("招待库")) { String price = baseGoodsSkuExtendFeign.selSalesPrice(d.getGoodsSkuSid()).getData(); if (StringUtils.isNotBlank(price)) { - extra.put("price",price); + extra.put("price", price); } else { - extra.put("price",""); + extra.put("price", ""); } } f.setExtra(extra); @@ -1345,13 +1410,13 @@ public class WmsInventoryService extends MybatisBaseService> selByGoodsIDAndUseOrgSid(String goodID, String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSid(goodID,useOrgSid); + List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSid(goodID, useOrgSid); return rb.success().setData(wmsInventoryList); } public ResultBean> selByGoodsIDAndUseOrgSidAndWarehouseSid(String goodID, String useOrgSid, String warehouseSid) { ResultBean rb = ResultBean.fireFail(); - List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodID,useOrgSid,warehouseSid); + List wmsInventoryList = baseMapper.selByGoodsIDAndUseOrgSidAndWarehouseSid(goodID, useOrgSid, warehouseSid); return rb.success().setData(wmsInventoryList); } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java new file mode 100644 index 0000000000..0388d18b41 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoListVo.java @@ -0,0 +1,48 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/26 10:40 + */ +@Data +public class GoodsTwoListVo { + + private String sid; + /** + * 商品名称 + */ + private String goodsName; + /** + * 图号 + */ + private String numId; + /** + * 仓库 + */ + private String store; + /** + * 仓库sid + */ + private String storeSid; + /** + * 可调数量 + */ + private String count; + /** + * 最大可调数量 + */ + private String maxCount; + /** + * 格式例：保内-仓库 库位编码 + */ + private String houseInfo; + /** + * 是否禁止修改(maxCount=1 true) + */ + private Boolean forbid = false; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoQuery.java new file mode 100644 index 0000000000..92463c2e0d --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoQuery.java @@ -0,0 +1,28 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/26 10:40 + */ +@Data +public class GoodsTwoQuery { + + private String orgPath; + /** + * 商品sid + */ + private String sid; + /** + * 需要去重的库存sid + */ + private List sids; + /** + * 仓库sid + */ + private String storeSid; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoVo.java new file mode 100644 index 0000000000..03fd007ece --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/appH5/GoodsTwoVo.java @@ -0,0 +1,41 @@ +package com.yxt.wms.biz.inventory.wmsinventory.appH5; + +import lombok.Data; + +import java.util.List; + +/** + * @author Fan + * @description + * @date 2024/6/26 10:40 + */ +@Data +public class GoodsTwoVo { + + /** + * 商品名称 + */ + private String goodsName; + /** + * 图号 + */ + private String numId; + /** + * 供应商 + */ + private String provider; + /** + * 首次入库日期 + */ + private String inboundTime; + /** + * 规格 + */ + private String goodsSkuOwnSpec; + /** + * 计量单位 + */ + private String unit; + + private List list; +} From c366dd95273b02eda82c27c79a23105195ef7f34 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Wed, 12 Feb 2025 15:05:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/apiadmin/base/BaseGoodsSpuRest.java | 8 + .../base/basegoodsspu/BaseGoodsSpuMapper.java | 4 + .../base/basegoodsspu/BaseGoodsSpuMapper.xml | 5 + .../basegoodsspu/BaseGoodsSpuService.java | 60 +++- .../base/basegoodsspu/YxtBaseFormCommon.java | 27 ++ .../oa/api/AdPurchaseAssetApplyRest.java | 92 +++++ .../AdPurchaseAssetApply.java | 55 +++ .../AdPurchaseAssetApplyDetailVo.java | 34 ++ .../AdPurchaseAssetApplyDto.java | 80 +++++ .../AdPurchaseAssetApplyMapper.java | 37 ++ .../AdPurchaseAssetApplyMapper.xml | 36 ++ .../AdPurchaseAssetApplyService.java | 335 ++++++++++++++++++ .../AdPurchaseAssetApplyVo.java | 73 ++++ .../AdPurchaseAssetDetails.java | 60 ++++ .../AdPurchaseAssetDetailsDto.java | 70 ++++ .../AdPurchaseAssetDetailsMapper.java | 41 +++ .../AdPurchaseAssetDetailsMapper.xml | 9 + .../AdPurchaseAssetDetailsService.java | 85 +++++ .../AdPurchaseAssetDetailsVo.java | 72 ++++ .../AdPurchaseAssetListDetailsVo.java | 69 ++++ .../oa/feign/flowable/flow/ProcDefEnum.java | 2 + 21 files changed, 1246 insertions(+), 8 deletions(-) create mode 100644 yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/YxtBaseFormCommon.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPurchaseAssetApplyRest.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApply.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDetailVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetails.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsDto.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.xml create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsService.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java create mode 100644 yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java index a65f9c356e..29676c5d21 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2024/3/7 16:58 @@ -119,4 +121,10 @@ public class BaseGoodsSpuRest { return baseGoodsSpuService.goodsListPage(pq); } + @ApiOperation("固定资产采购查询行政商品信息") + @GetMapping("/selPurchaseAssetInfo") + public ResultBean> selPurchaseAssetInfo(@RequestParam("orgPath") String orgPath) { + return baseGoodsSpuService.selPurchaseAssetInfo(orgPath); + } + } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java index 7e75235256..75cf26eeea 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/26 13:40 @@ -26,4 +28,6 @@ public interface BaseGoodsSpuMapper extends BaseMapper { BaseGoodsSpu checkForUpdate(@Param("goodsCode")String goodsCode,@Param("useOrgSid") String useOrgSid, @Param("sid")String sid); int selByCodeAndDept(@Param("code") String code,@Param("deptSid") String deptSid); + + List selPurchaseAssetInfo(@Param("useOrgSid") String useOrgSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml index 1514875d29..a5d431f7c0 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml @@ -99,4 +99,9 @@ WHERE WHERE goodsCode = #{code} AND useOrgSid = #{deptSid} + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index edb8aef7a2..c3e66f9fe9 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -23,6 +23,7 @@ import com.yxt.base.biz.base.basemanufacturer.BaseManufacturer; import com.yxt.base.biz.base.basemanufacturer.BaseManufacturerService; import com.yxt.base.feign.portal.privilege.PrivilegeQuery; import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.base.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.base.feign.portal.sysuser.SysUserFeign; import com.yxt.base.utils.PinYinUtils; @@ -37,10 +38,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; /** * @author wangpengfei @@ -268,9 +266,9 @@ public class BaseGoodsSpuService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.goodsListPage(page, qw); @@ -328,7 +326,7 @@ public class BaseGoodsSpuService extends MybatisBaseService selByCodeAndDept(String code, String deptSid) { ResultBean rb = ResultBean.fireFail(); - int i = baseMapper.selByCodeAndDept(code,deptSid); + int i = baseMapper.selByCodeAndDept(code, deptSid); return rb.success().setData(i); } + + public ResultBean> selPurchaseAssetInfo(String orgPath) { + ResultBean rb = ResultBean.fireFail(); + List list = new ArrayList<>(); + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List split = Arrays.asList(orgPath.split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + } + List goodsSpus = baseMapper.selPurchaseAssetInfo(useOrgSid); + if (!goodsSpus.isEmpty()) { + goodsSpus.stream().forEach(details -> { + YxtBaseFormCommon formCommon = new YxtBaseFormCommon(); + formCommon.setId(details.getSid()); + formCommon.setDictValue(details.getGoodsCode()); + Map extra = new HashMap<>(); + if (StringUtils.isNotBlank(details.getSid())) { + extra.put("goodsSpuSid", details.getSid()); + } + if (StringUtils.isNotBlank(details.getGoodsName())) { + extra.put("goodsSpuName", details.getGoodsName()); + } + + //商品sku + BaseGoodsSku skuUpdate = baseGoodsSkuService.getOneBySpuSid(details.getSid()); + if (null != skuUpdate) { + if (StringUtils.isNotBlank(skuUpdate.getIndexes())) { + extra.put("goodsSkuOwnSpec", skuUpdate.getIndexes()); + } + } + if (StringUtils.isNotBlank(details.getGoodsUnitName())) { + extra.put("unit", details.getGoodsUnitName()); + } + formCommon.setExtra(extra); + list.add(formCommon); + }); + } + return rb.success().setData(list); + } } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/YxtBaseFormCommon.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/YxtBaseFormCommon.java new file mode 100644 index 0000000000..469daf5cba --- /dev/null +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/YxtBaseFormCommon.java @@ -0,0 +1,27 @@ +package com.yxt.base.biz.base.basegoodsspu; + +import lombok.Data; + +import java.util.Map; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/16 + **/ +@Data +public class YxtBaseFormCommon { + + private String id; + private String dictValue; + + private Map extra; + + // 静态方法，直接通过方法创建对象并赋值 + public static YxtBaseFormCommon of(String id, String dictValue) { + YxtBaseFormCommon formCommon = new YxtBaseFormCommon(); + formCommon.setId(id); + formCommon.setDictValue(dictValue); + return formCommon; + } +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPurchaseAssetApplyRest.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPurchaseAssetApplyRest.java new file mode 100644 index 0000000000..c9d0cd7e5d --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdPurchaseAssetApplyRest.java @@ -0,0 +1,92 @@ +package com.yxt.anrui.oa.api; + +import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyDetailVo; +import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyDto; +import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyService; +import com.yxt.anrui.oa.biz.adpurchaseassetapply.AdPurchaseAssetApplyVo; +import com.yxt.anrui.oa.biz.oaform.flowable.CompleteDto; +import com.yxt.anrui.oa.biz.oaform.flowable.NodeQuery; +import com.yxt.anrui.oa.biz.oaform.flowable.TaskDto; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; + +@RestController +@RequestMapping("v1/AdPurchaseAssetApply") +public class AdPurchaseAssetApplyRest { + + + @Autowired + private AdPurchaseAssetApplyService adPurchaseAssetApplyService; + + @ApiOperation("初始化（新增或修改）") + @GetMapping({"/getInit", "/getInit/{sid}"}) + public ResultBean getInit( + @PathVariable(value = "sid", required = false) String sid, + @RequestParam(value = "userSid", required = false) String userSid, + @RequestParam(value = "orgPath", required = false) String orgPath) { + ResultBean rb = ResultBean.fireFail(); + if (sid == null || sid.isEmpty()) { + // 执行新增初始化 + if (userSid == null || orgPath == null) { + return rb.setMsg("userSid和orgPath不能为空"); + } + return adPurchaseAssetApplyService.getSaveInit(userSid, orgPath); + } else { + // 执行修改初始化 + return adPurchaseAssetApplyService.getUpdateInit(sid); + } + } + + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody AdPurchaseAssetApplyDto dto) { + return adPurchaseAssetApplyService.saveOrUpdateDto(dto); + } + + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids) { + ResultBean rb = ResultBean.fireFail(); + adPurchaseAssetApplyService.delAll(sids); + return rb.success(); + } + + @ApiOperation("详情") + @GetMapping("/details/{sid}") + ResultBean details(@PathVariable("sid") String sid + , @RequestParam(value = "application", required = false) String application) { + return adPurchaseAssetApplyService.details(sid,application); + } + + @ApiOperation("提交审批流程") + @PostMapping("/submit") + public ResultBean submit(@RequestBody @Valid AdPurchaseAssetApplyDto dto) { + return adPurchaseAssetApplyService.submit(dto); + } + + @ApiOperation(value = "办理（同意）") + @PutMapping("/complete") + public ResultBean complete(@Valid @RequestBody CompleteDto dto) { + return adPurchaseAssetApplyService.complete(dto); + } + + @ApiOperation(value = "驳回任务") + @PutMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody TaskDto dto) { + return adPurchaseAssetApplyService.reject(dto); + } + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap NodeQuery query) { + return adPurchaseAssetApplyService.getFlowOperateTitle(query); + } + + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApply.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApply.java new file mode 100644 index 0000000000..610044389c --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApply.java @@ -0,0 +1,55 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetapply; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "固定资产采购", description = "固定资产采购") +@TableName("ad_purchase_asset_apply") +public class AdPurchaseAssetApply extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("基础表单sid") + private String formSid; // 基础表单sid + @ApiModelProperty("关联审批sid列表,英文逗号分隔") + private String linkFormSids; // 关联审批sid列表,英文逗号分隔 + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别value") + private String assetTypeValue; // 固定资产类别value + @ApiModelProperty("是否有服务站机器设备（1是，0否）") + private String isStationKey; // 是否有服务站机器设备（1是，0否） + private String isStationValue; // 是否有服务站机器设备（1是，0否） + @ApiModelProperty("合计采购金额") + private BigDecimal totalAmount; // 合计采购金额 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDetailVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDetailVo.java new file mode 100644 index 0000000000..b48a164cea --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDetailVo.java @@ -0,0 +1,34 @@ +package com.yxt.anrui.oa.biz.adpurchaseassetapply; + +import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetListDetailsVo; +import com.yxt.anrui.oa.biz.oaform.OaFormCommonVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/1/21 + **/ +@Data +public class AdPurchaseAssetApplyDetailVo extends OaFormCommonVo { + + + + @ApiModelProperty("固定资产类别value") + private String assetTypeValue; // 固定资产类别value + private String isStationValue; // 是否有服务站机器设备（1是，0否） + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("合计采购金额") + private String totalAmount; // 合计采购金额 + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + private List list = new ArrayList<>(); + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDto.java new file mode 100644 index 0000000000..a563f744f8 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyDto.java @@ -0,0 +1,80 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetapply; + + +import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsDto; +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.anrui.oa.biz.oaform.OaFormDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * Project: oa(驻外人员认定申请)
+ * File: AdExpatriatesApplyDto.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesapply.AdExpatriatesApplyDto
+ * Description: 驻外人员认定申请 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-16 15:22:53
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "驻外人员认定申请 数据传输对象", description = "驻外人员认定申请 数据传输对象") +public class AdPurchaseAssetApplyDto extends OaFormDto { + + private FormCommon assetTypeObj; + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别value") + private String assetTypeValue; // 固定资产类别value + + private FormCommon isStationObj; + @ApiModelProperty("是否有服务站机器设备（1是，0否）") + private String isStationKey; // 是否有服务站机器设备（1是，0否） + private String isStationValue; // 是否有服务站机器设备（1是，0否） + + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("合计采购金额") + private String totalAmount; // 合计采购金额 + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.java new file mode 100644 index 0000000000..3084c96ae8 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.java @@ -0,0 +1,37 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetapply; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface AdPurchaseAssetApplyMapper extends BaseMapper { + + int selectBySid(String join); + + AdPurchaseAssetApplyDetailVo details(String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.xml new file mode 100644 index 0000000000..42e7755bbd --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyService.java new file mode 100644 index 0000000000..4fbb99cdad --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyService.java @@ -0,0 +1,335 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetapply; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsDto; +import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsService; +import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsVo; +import com.yxt.anrui.oa.biz.oaappendix.OaAppendixService; +import com.yxt.anrui.oa.biz.oaform.*; +import com.yxt.anrui.oa.biz.oaform.flowable.*; +import com.yxt.anrui.oa.feign.file.OaFileEnum; +import com.yxt.anrui.oa.feign.flowable.flow.ProcDefEnum; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.oa.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class AdPurchaseAssetApplyService extends MybatisBaseService { + + @Autowired + private OaAppendixService oaAppendixService; + @Autowired + private OaFormService oaFormService; + @Autowired + private AdPurchaseAssetDetailsService adPurchaseAssetDetailsService; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; + + public ResultBean getSaveInit(String userSid, String orgPath) { + ResultBean rb = ResultBean.fireFail(); + AdPurchaseAssetApplyVo adPurchaseAssetApplyVo = new AdPurchaseAssetApplyVo(); + adPurchaseAssetApplyVo.setCreateBySid(userSid); + adPurchaseAssetApplyVo.setOrgSidPath(orgPath); + return rb.success().setData(adPurchaseAssetApplyVo); + } + + public ResultBean getUpdateInit(String sid) { + ResultBean rb = ResultBean.fireFail(); + AdPurchaseAssetApplyVo adPurchaseAssetApplyVo = new AdPurchaseAssetApplyVo(); + AdPurchaseAssetApply adPurchaseAssetApply = fetchBySid(sid); + if (adPurchaseAssetApply == null) { + return rb.setMsg("该申请不存在"); + } + OaForm oaForm = oaFormService.fetchBySid(sid); + adPurchaseAssetApplyVo.setTaskId(oaForm.getTaskId()); + adPurchaseAssetApplyVo.setProcInsId(oaForm.getProcInstId()); + //根据部门sid获取orgPath并赋值 + SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData(); + String orgSidPath = organizationVo.getOrgSidPath(); + adPurchaseAssetApplyVo.setOrgSidPath(orgSidPath); + adPurchaseAssetApplyVo.setCreateBySid(oaForm.getCreateBySid()); + BeanUtil.copyProperties(adPurchaseAssetApply, adPurchaseAssetApplyVo); + FormCommon assetTypeObj = FormCommon.of(adPurchaseAssetApply.getAssetTypeKey(), adPurchaseAssetApply.getAssetTypeValue()); + adPurchaseAssetApplyVo.setAssetTypeObj(assetTypeObj); + FormCommon isStationObj = FormCommon.of(adPurchaseAssetApply.getIsStationKey(), adPurchaseAssetApply.getIsStationValue()); + adPurchaseAssetApplyVo.setIsStationObj(isStationObj); + List list = adPurchaseAssetDetailsService.getUpdateInit(sid); + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + FormCommon assetObj = new FormCommon(); + assetObj.setId(details.getSid()); + assetObj.setDictValue(details.getGoodsSkuCode()); + Map extra = new HashMap<>(); + if (StringUtils.isNotBlank(details.getGoodsSpuName())) { + extra.put("goodsSpuName",details.getGoodsSpuName()); + } + if (StringUtils.isNotBlank(details.getGoodsSkuOwnSpec())) { + extra.put("goodsSkuOwnSpec",details.getGoodsSkuOwnSpec()); + } + if (StringUtils.isNotBlank(details.getUnit())) { + extra.put("unit",details.getUnit()); + } + assetObj.setExtra(extra); + details.setAssetObj(assetObj); + }); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + adPurchaseAssetApplyVo.setFiles(files); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adPurchaseAssetApplyVo.setAppes(appes); + adPurchaseAssetApplyVo.setList(list); + adPurchaseAssetApplyVo.setSid(sid); + return rb.success().setData(adPurchaseAssetApplyVo); + } + + public ResultBean saveOrUpdateDto(AdPurchaseAssetApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); + List files = dto.getFiles(); + List appes = dto.getAppes(); + List list = dto.getList(); + if (StringUtils.isBlank(sid)) { + // 新建操作 + AdPurchaseAssetApply entity = new AdPurchaseAssetApply(); + BeanUtil.copyProperties(dto, entity, "sid"); + + dto.setBillNo("GDZCCGSQ"); + dto.setSid(entity.getSid()); + ResultBean resultBean = oaFormService.saveOaForm(dto); + + if (!resultBean.getSuccess()) { + return rb; + } + + entity.setFormSid(resultBean.getData()); + baseMapper.insert(entity); + sid = entity.getSid(); + } else { + // 更新操作 + AdPurchaseAssetApply entity = fetchBySid(sid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + adPurchaseAssetDetailsService.saveDetails(list, sid); + // 处理附件 + saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片"); + saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件"); + return rb.success().setData(sid); + } + + // 保存文件 + private void saveFiles(String sid, List files, String attachType, String fileType) { + files.removeAll(Collections.singleton(null)); + oaAppendixService.saveFile(sid, files, attachType, fileType); + } + + public ResultBean delAll(String[] sids) { + ResultBean rb = ResultBean.fireFail(); + //查询该sid中是否有流程不是待提交的 + int count = baseMapper.selectBySid(StringUtils.join(sids, ",")); + if (count > 0) { + return rb.setMsg("删除的数据中包含已提交或已办结审批的数据，删除失败"); + } + delBySids(sids); + return rb.success(); + } + + public ResultBean details(String sid, String application) { + ResultBean rb = ResultBean.fireFail(); + AdPurchaseAssetApplyDetailVo adExpatriatesApplyDetailVo = baseMapper.details(sid); + if (adExpatriatesApplyDetailVo == null) { + return rb.setMsg("该申请不存在"); + } + List files = oaAppendixService.selectByLinkSid(sid, "图片"); + List appes = oaAppendixService.selectByLinkSid(sid, "文件"); + adExpatriatesApplyDetailVo.setFiles(files); + adExpatriatesApplyDetailVo.setAppes(appes); + //基础字段赋值 + BeanUtil.copyProperties(oaFormService.getDetails(sid), adExpatriatesApplyDetailVo); + return rb.success().setData(adExpatriatesApplyDetailVo); + } + + /** + * 提交 + * + * @param dto + * @return + */ + public ResultBean submit(AdPurchaseAssetApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); + ResultBean stringResultBean = saveOrUpdateDto(dto); + if (!stringResultBean.getSuccess()) { + return rb.setMsg(stringResultBean.getData()); + } + String businessSid = stringResultBean.getData(); + + SubmitDto submitDto = new SubmitDto(); + submitDto.setUserSid(dto.getCreateBySid()); + submitDto.setBusinessSid(businessSid); + + Map formVariables = new HashMap<>(); + formVariables = getMap(formVariables, businessSid); + submitDto.setFormVariables(formVariables); + submitDto.setProcDefId(ProcDefEnum.HIHIREAPPLY.getProDefId()); + submitDto.setNextTaskId(dto.getTaskId()); + submitDto.setRule(OaFormRuleEnum.DIRECTLY_UNDER.getRule()); + return oaFormService.submit(submitDto); + } + + /** + * 办理（同意） + * + * @param dto + * @return + */ + public ResultBean complete(CompleteDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + BusinessVariablesDto businessVariablesDto = new BusinessVariablesDto(); + BeanUtil.copyProperties(dto, businessVariablesDto); + return oaFormService.complete(businessVariablesDto); + } + + /** + * 驳回 + * + * @param dto + * @return + */ + public ResultBean reject(TaskDto dto) { + Map formVariables = dto.getFormVariables(); + formVariables = getMap(formVariables, dto.getBusinessSid()); + dto.setFormVariables(formVariables); + return oaFormService.reject(dto); + } + + public ResultBean getFlowOperateTitle(NodeQuery query) { + // 默认失败返回 + ResultBean rb = ResultBean.fireFail(); + + // 获取next值和formVariables + int next = query.getNext(); + + // 获取并更新formVariables + Map formVariables = getMap(query.getFormVariables(), query.getBusinessSid()); + query.setFormVariables(formVariables); + + // 校验next参数是否有效（只允许0或1） + if (next != 0 && next != 1) { + return rb.setMsg("参数错误：next"); // 如果next不是0或1，返回错误信息 + } + + // 获取节点名称 + String data = getNodeName(query, next); + + // 如果data为null，表示未获取到有效的节点信息 + if (data == null) { + return rb.setMsg("没有获取到节点信息"); // 返回错误消息 + } + + // 返回成功的结果和获取到的节点名称 + return rb.success().setData(data); + } + + /** + * 网关参数组成 + * + * @param formVariables + * @param sid + * @return + */ + public Map getMap(Map formVariables, String sid) { + Map appMap = new HashMap<>(); + appMap.put("sid", sid); + /*appMap.put("editUrl", "approval/#/pages/EditOnboradingApplyActivity?sid=" + sid); + appMap.put("detailUrl", "approval/#/pages/DetailOnboradingApplyActivity?sid=" + sid); + appMap.put("flowOperateUrl", "oa/v1/HrHireApply/getFlowOperateTitle"); + appMap.put("agreeUrl", "oa/v1/HrHireApply/complete"); + appMap.put("stopUrl", "oa/v1/oaform/breakProcess"); + appMap.put("rejectUrl", "oa/v1/HrHireApply/reject"); + appMap.put("recallUrl", "oa/v1/oaform/revokeProcess"); + appMap.put("signUrl", "oa/v1/oaform/delegate"); + appMap.put("transferUrl", "oa/v1/oaform/assignTask");*/ + appMap.put(OaFormUrlEnum.HRHIREAPPLY_EDIT.getType(), OaFormUrlEnum.HRHIREAPPLY_EDIT.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_DETAIL.getType(), OaFormUrlEnum.HRHIREAPPLY_DETAIL.getUrl() + "?sid=" + sid); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_FLOWOPERATEURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getType(), OaFormUrlEnum.HRHIREAPPLY_AGREEURL.getUrl()); + appMap.put(OaFormUrlEnum.STOPURL.getType(), OaFormUrlEnum.STOPURL.getUrl()); + appMap.put(OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getType(), OaFormUrlEnum.HRHIREAPPLY_REJECTURL.getUrl()); + appMap.put(OaFormUrlEnum.RECALLURL.getType(), OaFormUrlEnum.RECALLURL.getUrl()); + appMap.put(OaFormUrlEnum.SIGNURL.getType(), OaFormUrlEnum.SIGNURL.getUrl()); + appMap.put(OaFormUrlEnum.TRANSFERURL.getType(), OaFormUrlEnum.TRANSFERURL.getUrl()); + formVariables.put("app", appMap); + //根据组织查询是否是分公司 + OaForm oaForm = oaFormService.fetchBySid(sid); + AdPurchaseAssetApply adExpatriatesApply = fetchBySid(sid); + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(oaForm.getUseOrgSid()).getData(); + //是否是分公司 + formVariables.put("isTrue", sysOrganization.getIsDept() == 0); + return formVariables; + } + + /** + * 根据next的值获取前一个节点或下一个节点的名称。 + * + * @param query 包含查询所需参数的NodeQuery对象 + * @param next 参数，0表示上一环节，1表示下一环节 + * @return 节点名称，如果失败则返回null + */ + private String getNodeName(NodeQuery query, int next) { + // 根据next值选择相应的服务方法获取节点信息 + ResultBean> resultBean = (next == 0) + ? oaFormService.getPreviousNodesForReject(query) // 获取上一环节的节点 + : oaFormService.getNextNodesForSubmit(query); // 获取下一环节的节点 + // 如果服务调用成功 + if (resultBean.getSuccess()) { + // 清除结果列表中的null值，避免空节点 + resultBean.getData().removeAll(Collections.singleton(null)); + // 如果结果列表非空，返回第一个节点的名称 + if (!resultBean.getData().isEmpty()) { + return resultBean.getData().get(0).getName(); + } + } else { + // 如果服务调用失败，返回null + return null; + } + // 如果结果为空，返回null + return null; + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyVo.java new file mode 100644 index 0000000000..aaea3d8700 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyVo.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetapply; + +import com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetDetailsVo; +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class AdPurchaseAssetApplyVo { + + private String sid; + /* private String userSid; + private String orgPath;*/ + private String orgSidPath; + private String createBySid; + + private FormCommon assetTypeObj; + @ApiModelProperty("固定资产类别key") + private String assetTypeKey; // 固定资产类别key + @ApiModelProperty("固定资产类别value") + private String assetTypeValue; // 固定资产类别value + + private FormCommon isStationObj; + @ApiModelProperty("是否有服务站机器设备（1是，0否）") + private String isStationKey; // 是否有服务站机器设备（1是，0否） + private String isStationValue; // 是否有服务站机器设备（1是，0否） + + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("合计采购金额") + private String totalAmount; // 合计采购金额 + + @ApiModelProperty("图片") + private List files = new ArrayList<>(); + @ApiModelProperty("附件") + private List appes = new ArrayList<>(); + + private List list = new ArrayList<>(); + + private String taskId; + @ApiModelProperty("流程实例id") + private String procInsId; + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetails.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetails.java new file mode 100644 index 0000000000..8e1f9ac01f --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetails.java @@ -0,0 +1,60 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetdetails; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +@ApiModel(value = "固定资产采购列表", description = "固定资产采购") +@TableName("ad_purchase_asset_details") +public class AdPurchaseAssetDetails extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("申请sid") + private String mainSid; // 申请sid + @ApiModelProperty("固定资产基础信息sid") + private String goodsSpuSid; // 固定资产基础信息sid + @ApiModelProperty("固定资产编号") + private String goodsSkuCode; // 固定资产编号 + @ApiModelProperty("固定资产名称") + private String goodsSpuName; // 固定资产名称 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("预计采购单价") + private BigDecimal cost; // 预计采购单价 + @ApiModelProperty("预计采购数量") + private BigDecimal estimateCount; // 预计采购数量 + @ApiModelProperty("预计采购金额") + private BigDecimal estimateMoney; // 预计采购金额 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsDto.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsDto.java new file mode 100644 index 0000000000..cfd7fb201a --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsDto.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetdetails; + + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
+ * Description: 驻外人员认定列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") +public class AdPurchaseAssetDetailsDto implements Vo { + + @ApiModelProperty("固定资产") + private FormCommon assetObj; + @ApiModelProperty("固定资产基础信息sid") + private String goodsSpuSid; // 固定资产基础信息sid + @ApiModelProperty("固定资产编号") + private String goodsSkuCode; // 固定资产编号 + @ApiModelProperty("固定资产名称") + private String goodsSpuName; // 固定资产名称 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("预计采购单价") + private String cost; // 预计采购单价 + @ApiModelProperty("预计采购数量") + private String estimateCount; // 预计采购数量 + @ApiModelProperty("预计采购金额") + private String estimateMoney; // 预计采购金额 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.java new file mode 100644 index 0000000000..105316709b --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.java @@ -0,0 +1,41 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetdetails; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface AdPurchaseAssetDetailsMapper extends BaseMapper { + + @Select("select * from ad_purchase_asset_details where mainSid = #{mainSid}") + List selectByMainSid(String mainSid); + + List getUpdateInit(String sid); +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.xml b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.xml new file mode 100644 index 0000000000..6e15216bac --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsMapper.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsService.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsService.java new file mode 100644 index 0000000000..12e8416ef6 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsService.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetdetails; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.base.service.MybatisBaseService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +@Service +public class AdPurchaseAssetDetailsService extends MybatisBaseService { + + public void saveDetails(List list, String sid) { + //根据sid查询明细并删除 + List list2 = baseMapper.selectByMainSid(sid); + list2.removeAll(Collections.singleton(null)); + if (!list2.isEmpty()) { + list2.stream().forEach(v -> { + deleteBySid(v.getSid()); + }); + } + list.removeAll(Collections.singleton(null)); + if (!list.isEmpty()) { + list.stream().forEach(details -> { + AdPurchaseAssetDetails adPurchaseAssetDetails = new AdPurchaseAssetDetails(); + BeanUtil.copyProperties(details, adPurchaseAssetDetails); + adPurchaseAssetDetails.setMainSid(sid); + FormCommon assetObj = details.getAssetObj(); + adPurchaseAssetDetails.setGoodsSkuCode(assetObj.getDictValue()); + adPurchaseAssetDetails.setGoodsSpuSid(assetObj.getId()); + Map extra = assetObj.getExtra(); + adPurchaseAssetDetails.setGoodsSpuSid(assetObj.getId()); + adPurchaseAssetDetails.setGoodsSkuCode(assetObj.getDictValue()); + if (null != extra) { + for (Map.Entry entry : extra.entrySet()) { + if (StringUtils.isNotBlank((String)entry.getValue())) { + if (entry.getKey().equals("goodsSpuName")) { + adPurchaseAssetDetails.setGoodsSpuName((String)entry.getValue()); + } + if (entry.getKey().equals("goodsSkuOwnSpec")) { + adPurchaseAssetDetails.setGoodsSkuOwnSpec((String)entry.getValue()); + } + if (entry.getKey().equals("unit")) { + adPurchaseAssetDetails.setUnit((String)entry.getValue()); + } + } + } + } + baseMapper.insert(adPurchaseAssetDetails); + }); + } + } + + public List getUpdateInit(String sid) { + return baseMapper.getUpdateInit(sid); + } +} \ No newline at end of file diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java new file mode 100644 index 0000000000..319c7a7c9b --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsVo.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetdetails; + + +import com.yxt.anrui.oa.biz.oaform.FormCommon; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
+ * Description: 驻外人员认定列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") +public class AdPurchaseAssetDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("固定资产") + private FormCommon assetObj; + @ApiModelProperty("固定资产基础信息sid") + private String goodsSpuSid; // 固定资产基础信息sid + @ApiModelProperty("固定资产编号") + private String goodsSkuCode; // 固定资产编号 + @ApiModelProperty("固定资产名称") + private String goodsSpuName; // 固定资产名称 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("预计采购单价") + private String cost; // 预计采购单价 + @ApiModelProperty("预计采购数量") + private String estimateCount; // 预计采购数量 + @ApiModelProperty("预计采购金额") + private String estimateMoney; // 预计采购金额 +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java new file mode 100644 index 0000000000..91a0006871 --- /dev/null +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetListDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.oa.biz.adpurchaseassetdetails; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-oa(认定人员)
+ * File: AdExpatriatesDetailVo.java
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo
+ * Description: 驻外人员认定列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2025-01-20 15:35:08
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象") +public class AdPurchaseAssetListDetailsVo implements Vo { + + private String sid; + + + @ApiModelProperty("固定资产编号") + private String goodsSkuCode; // 固定资产编号 + @ApiModelProperty("固定资产名称") + private String goodsSpuName; // 固定资产名称 + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; // 规格型号 + @ApiModelProperty("单位") + private String unit; // 单位 + @ApiModelProperty("预计采购单价") + private String cost; // 预计采购单价 + @ApiModelProperty("预计采购数量") + private String estimateCount; // 预计采购数量 + @ApiModelProperty("预计采购金额") + private String estimateMoney; // 预计采购金额 + +} diff --git a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java index 6b989b5a5a..9684e40d69 100644 --- a/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java @@ -11,6 +11,8 @@ public enum ProcDefEnum { OAMENDAPPLY("补卡申请", "process_9suucr96:1:16072504"), HIHIREAPPLY("招聘需求", "process_zy0m4jrp:1:16802504"), BGYPLYAPPLY("办公用品领用", ""), + GDZCCG_GS_APPLY("公司固定资产采购申请", ""), + GDZCCG_ZX_APPLY("中心固定资产采购申请", ""), ;