固定资产调拨

yxt-oa/src/main/java/com/yxt/anrui/oa/api/AdAllocateAssetApplyRest.java

@@ -0,0 +1,91 @@
+package com.yxt.anrui.oa.api;
+
+import com.yxt.anrui.oa.biz.adallocateassetapply.AdAllocateAssetApplyDetailVo;
+import com.yxt.anrui.oa.biz.adallocateassetapply.AdAllocateAssetApplyDto;
+import com.yxt.anrui.oa.biz.adallocateassetapply.AdAllocateAssetApplyService;
+import com.yxt.anrui.oa.biz.adallocateassetapply.AdAllocateAssetApplyVo;
+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/AdAllocateAssetApply")
+public class AdAllocateAssetApplyRest {
+
+
+    @Autowired
+    private AdAllocateAssetApplyService adAllocateAssetApplyService;
+
+    @ApiOperation("初始化（新增或修改）")
+    @GetMapping({"/getInit", "/getInit/{sid}"})
+    public ResultBean<AdAllocateAssetApplyVo> getInit(
+            @PathVariable(value = "sid", required = false) String sid,
+            @RequestParam(value = "userSid", required = false) String userSid,
+            @RequestParam(value = "orgPath", required = false) String orgPath) {
+        ResultBean<AdAllocateAssetApplyVo> rb = ResultBean.fireFail();
+        if (sid == null || sid.isEmpty()) {
+            // 执行新增初始化
+            if (userSid == null || orgPath == null) {
+                return rb.setMsg("userSid和orgPath不能为空");
+            }
+            return adAllocateAssetApplyService.getSaveInit(userSid, orgPath);
+        } else {
+            // 执行修改初始化
+            return adAllocateAssetApplyService.getUpdateInit(sid);
+        }
+    }
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AdAllocateAssetApplyDto dto) {
+        return adAllocateAssetApplyService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        adAllocateAssetApplyService.delAll(sids);
+        return rb.success();
+    }
+
+    @ApiOperation("详情")
+    @GetMapping("/details/{sid}")
+    ResultBean<AdAllocateAssetApplyDetailVo> details(@PathVariable("sid") String sid
+            , @RequestParam(value = "application", required = false) String application) {
+        return adAllocateAssetApplyService.details(sid,application);
+    }
+
+    @ApiOperation("提交审批流程")
+    @PostMapping("/submit")
+    public ResultBean submit(@RequestBody @Valid AdAllocateAssetApplyDto dto) {
+        return adAllocateAssetApplyService.submit(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PutMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteDto dto) {
+        return adAllocateAssetApplyService.complete(dto);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/reject")
+    public ResultBean reject(@Valid @RequestBody TaskDto dto) {
+        return adAllocateAssetApplyService.reject(dto);
+    }
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap NodeQuery query) {
+        return adAllocateAssetApplyService.getFlowOperateTitle(query);
+    }
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApply.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetapply;
+
+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_allocate_asset_apply")
+public class AdAllocateAssetApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("基础表单sid")
+    private String formSid; // 基础表单sid
+    @ApiModelProperty("固定资产类别key")
+    private String assetTypeKey; // 固定资产类别key
+    @ApiModelProperty("固定资产类别value")
+    private String assetTypeValue; // 固定资产类别value
+    @ApiModelProperty("调拨类别key")
+    private String allocateKey; // 调拨类别key
+    @ApiModelProperty("调拨类别value")
+    private String allocateValue; // 调拨类别value
+    @ApiModelProperty("调入部门sid")
+    private String intoDeptSid; // 调入部门sid
+    @ApiModelProperty("调入部门")
+    private String intoDept; // 调入部门
+    @ApiModelProperty("调出部门sid")
+    private String pullDeptSid; // 调出部门sid
+    @ApiModelProperty("调出部门")
+    private String pullDept; // 调出部门
+    @ApiModelProperty("调拨事由")
+    private String allocateReason; // 调拨事由
+    @ApiModelProperty("调拨资产金额合计")
+    private BigDecimal totalAmount; // 调拨资产金额合计
+
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApplyDetailVo.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.oa.biz.adallocateassetapply;
+
+import com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetListDetailsVo;
+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 AdAllocateAssetApplyDetailVo extends OaFormCommonVo {
+
+
+    @ApiModelProperty("固定资产类别value")
+    private String assetTypeValue; // 固定资产类别value
+    @ApiModelProperty("调拨类别value")
+    private String allocateValue; // 调拨类别value
+    @ApiModelProperty("调入部门")
+    private String intoDept; // 调入部门
+    @ApiModelProperty("调出部门")
+    private String pullDept; // 调出部门
+    @ApiModelProperty("调拨事由")
+    private String allocateReason; // 调拨事由
+    @ApiModelProperty("调拨资产金额合计")
+    private String totalAmount; // 调拨资产金额合计
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+    private List<AdAllocateAssetListDetailsVo> list = new ArrayList<>();
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApplyDto.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetapply;
+
+
+import com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsDto;
+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;
+
+/**
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "固定资产调拨 数据传输对象", description = "固定资产调拨 数据传输对象")
+public class AdAllocateAssetApplyDto extends OaFormDto {
+
+
+    private FormCommon allocateObj;
+    @ApiModelProperty("调拨类别key")
+    private String allocateKey; // 调拨类别key
+    @ApiModelProperty("调拨类别value")
+    private String allocateValue; // 调拨类别value
+
+    private FormCommon assetTypeObj;
+    @ApiModelProperty("固定资产类别key")
+    private String assetTypeKey; // 固定资产类别key
+    @ApiModelProperty("固定资产类别value")
+    private String assetTypeValue; // 固定资产类别value
+
+    private FormCommon intoDeptObj;
+    @ApiModelProperty("调入部门sid")
+    private String intoDeptSid; // 调入部门sid
+    @ApiModelProperty("调入部门")
+    private String intoDept; // 调入部门
+
+    private FormCommon pullDeptObj;
+    @ApiModelProperty("调出部门sid")
+    private String pullDeptSid; // 调出部门sid
+    @ApiModelProperty("调出部门")
+    private String pullDept; // 调出部门
+
+    @ApiModelProperty("调拨事由")
+    private String allocateReason; // 调拨事由
+    @ApiModelProperty("调拨资产金额合计")
+    private String totalAmount; // 调拨资产金额合计
+
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdAllocateAssetDetailsDto> list = new ArrayList<>();
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApplyMapper.java

@@ -0,0 +1,37 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetapply;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface AdAllocateAssetApplyMapper extends BaseMapper<AdAllocateAssetApply> {
+
+    int selectBySid(String join);
+
+    AdAllocateAssetApplyDetailVo details(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApplyMapper.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adallocateassetapply.AdAllocateAssetApplyMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+    <select id="selectBySid" resultType="int">
+        SELECT COUNT(*)
+        FROM ad_allocate_asset_apply ae
+                 left join oa_form ofm on ae.formSid = ofm.sid
+        WHERE ofm.nodeState != '待提交'
+          and find_in_set(oa.sid, #{list})
+    </select>
+
+    <select id="details" resultMap="detailMap">
+        select allocateReason, sid,assetTypeValue,allocateValue,totalAmount,intoDept,pullDept
+        from ad_allocate_asset_apply
+        where sid = #{sid}
+    </select>
+
+    <resultMap id="detailMap" type="com.yxt.anrui.oa.biz.adallocateassetapply.AdAllocateAssetApplyDetailVo">
+        <result column="allocateReason" property="allocateReason"/>
+        <result column="assetTypeValue" property="assetTypeValue"/>
+        <result column="allocateValue" property="allocateValue"/>
+        <result column="intoDept" property="intoDept"/>
+        <result column="pullDept" property="pullDept"/>
+        <result column="totalAmount" property="totalAmount"/>
+        <collection property="list" ofType="com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetListDetailsVo"
+                    select="selectList" column="sid">
+        </collection>
+    </resultMap>
+
+    <select id="selectList" resultType="com.yxt.anrui.oa.biz.adpurchaseassetdetails.AdPurchaseAssetListDetailsVo">
+        select *
+        from ad_allocate_asset_details
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApplyService.java

@@ -0,0 +1,339 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsDto;
+import com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsService;
+import com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsVo;
+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 AdAllocateAssetApplyService extends MybatisBaseService<AdAllocateAssetApplyMapper, AdAllocateAssetApply> {
+
+    @Autowired
+    private OaAppendixService oaAppendixService;
+    @Autowired
+    private OaFormService oaFormService;
+    @Autowired
+    private AdAllocateAssetDetailsService adAllocateAssetDetailsService;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+    public ResultBean<AdAllocateAssetApplyVo> getSaveInit(String userSid, String orgPath) {
+        ResultBean<AdAllocateAssetApplyVo> rb = ResultBean.fireFail();
+        AdAllocateAssetApplyVo adAllocateAssetApplyVo = new AdAllocateAssetApplyVo();
+        adAllocateAssetApplyVo.setCreateBySid(userSid);
+        adAllocateAssetApplyVo.setOrgSidPath(orgPath);
+        return rb.success().setData(adAllocateAssetApplyVo);
+    }
+
+    public ResultBean<AdAllocateAssetApplyVo> getUpdateInit(String sid) {
+        ResultBean<AdAllocateAssetApplyVo> rb = ResultBean.fireFail();
+        AdAllocateAssetApplyVo adAllocateAssetApplyVo = new AdAllocateAssetApplyVo();
+        AdAllocateAssetApply adAllocateAssetApply = fetchBySid(sid);
+        if (adAllocateAssetApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        OaForm oaForm = oaFormService.fetchBySid(sid);
+        adAllocateAssetApplyVo.setTaskId(oaForm.getTaskId());
+        adAllocateAssetApplyVo.setProcInsId(oaForm.getProcInstId());
+        //根据部门sid获取orgPath并赋值
+        SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(oaForm.getDeptSid()).getData();
+        String orgSidPath = organizationVo.getOrgSidPath();
+        adAllocateAssetApplyVo.setOrgSidPath(orgSidPath);
+        adAllocateAssetApplyVo.setCreateBySid(oaForm.getCreateBySid());
+        BeanUtil.copyProperties(adAllocateAssetApply, adAllocateAssetApplyVo);
+        FormCommon assetTypeObj = FormCommon.of(adAllocateAssetApply.getAssetTypeKey(), adAllocateAssetApply.getAssetTypeValue());
+        adAllocateAssetApplyVo.setAssetTypeObj(assetTypeObj);
+        FormCommon allocateObj = FormCommon.of(adAllocateAssetApply.getAllocateKey(), adAllocateAssetApply.getAllocateValue());
+        adAllocateAssetApplyVo.setAllocateObj(allocateObj);
+        FormCommon intoDeptObj = FormCommon.of(adAllocateAssetApply.getIntoDeptSid(), adAllocateAssetApply.getIntoDept());
+        adAllocateAssetApplyVo.setIntoDeptObj(intoDeptObj);
+        FormCommon pullDeptObj = FormCommon.of(adAllocateAssetApply.getPullDeptSid(), adAllocateAssetApply.getPullDept());
+        adAllocateAssetApplyVo.setPullDeptObj(pullDeptObj);
+        List<AdAllocateAssetDetailsVo> list = adAllocateAssetDetailsService.getUpdateInit(sid);
+        list.removeAll(Collections.singleton(null));
+        if (!list.isEmpty()) {
+            list.stream().forEach(details -> {
+                FormCommon assetObj = new FormCommon();
+                assetObj.setId(details.getInventorySid());
+                assetObj.setDictValue(details.getGoodsID());
+                Map<String, Object> 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.getGoodsSkuCode())) {
+                    extra.put("goodsSkuCode",details.getGoodsSkuCode());
+                }
+                assetObj.setExtra(extra);
+                details.setAssetObj(assetObj);
+            });
+        }
+        List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+        adAllocateAssetApplyVo.setFiles(files);
+        List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+        adAllocateAssetApplyVo.setAppes(appes);
+        adAllocateAssetApplyVo.setList(list);
+        adAllocateAssetApplyVo.setSid(sid);
+        return rb.success().setData(adAllocateAssetApplyVo);
+    }
+
+    public ResultBean<String> saveOrUpdateDto(AdAllocateAssetApplyDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        List<String> files = dto.getFiles();
+        List<String> appes = dto.getAppes();
+        List<AdAllocateAssetDetailsDto> list = dto.getList();
+        if (StringUtils.isBlank(sid)) {
+            // 新建操作
+            AdAllocateAssetApply entity = new AdAllocateAssetApply();
+            BeanUtil.copyProperties(dto, entity, "sid");
+
+            dto.setBillNo("GDZCDBSQ");
+            dto.setSid(entity.getSid());
+            ResultBean<String> resultBean = oaFormService.saveOaForm(dto);
+
+            if (!resultBean.getSuccess()) {
+                return rb;
+            }
+
+            entity.setFormSid(resultBean.getData());
+            baseMapper.insert(entity);
+            sid = entity.getSid();
+        } else {
+            // 更新操作
+            AdAllocateAssetApply entity = fetchBySid(sid);
+            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            baseMapper.updateById(entity);
+        }
+        adAllocateAssetDetailsService.saveDetails(list, sid);
+        // 处理附件
+        saveFiles(sid, files, OaFileEnum.ADALLOCATEASSETAPPLY.getAttachType(), "图片");
+        saveFiles(sid, appes, OaFileEnum.ADALLOCATEASSETAPPLY.getAttachType(), "文件");
+        return rb.success().setData(sid);
+    }
+
+    // 保存文件
+    private void saveFiles(String sid, List<String> 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<AdAllocateAssetApplyDetailVo> details(String sid, String application) {
+        ResultBean<AdAllocateAssetApplyDetailVo> rb = ResultBean.fireFail();
+        AdAllocateAssetApplyDetailVo adAllocateAssetApplyDetailVo = baseMapper.details(sid);
+        if (adAllocateAssetApplyDetailVo == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
+        List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
+        adAllocateAssetApplyDetailVo.setFiles(files);
+        adAllocateAssetApplyDetailVo.setAppes(appes);
+        //基础字段赋值
+        BeanUtil.copyProperties(oaFormService.getDetails(sid), adAllocateAssetApplyDetailVo);
+        return rb.success().setData(adAllocateAssetApplyDetailVo);
+    }
+
+    /**
+     * 提交
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean submit(AdAllocateAssetApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<String> 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<String, Object> 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<String, Object> 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<String, Object> formVariables = dto.getFormVariables();
+        formVariables = getMap(formVariables, dto.getBusinessSid());
+        dto.setFormVariables(formVariables);
+        return oaFormService.reject(dto);
+    }
+
+    public ResultBean<String> getFlowOperateTitle(NodeQuery query) {
+        // 默认失败返回
+        ResultBean<String> rb = ResultBean.fireFail();
+
+        // 获取next值和formVariables
+        int next = query.getNext();
+
+        // 获取并更新formVariables
+        Map<String, Object> 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<String, Object> getMap(Map<String, Object> formVariables, String sid) {
+        Map<String, Object> 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);
+        AdAllocateAssetApply 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<List<NodeVo>> 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;
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetapply/AdAllocateAssetApplyVo.java

@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetapply;
+
+import com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsVo;
+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 AdAllocateAssetApplyVo {
+
+    private String sid;
+    /*  private String userSid;
+      private String orgPath;*/
+    private String orgSidPath;
+    private String createBySid;
+
+    private FormCommon allocateObj;
+    @ApiModelProperty("调拨类别key")
+    private String allocateKey; // 调拨类别key
+    @ApiModelProperty("调拨类别value")
+    private String allocateValue; // 调拨类别value
+
+    private FormCommon assetTypeObj;
+    @ApiModelProperty("固定资产类别key")
+    private String assetTypeKey; // 固定资产类别key
+    @ApiModelProperty("固定资产类别value")
+    private String assetTypeValue; // 固定资产类别value
+
+    private FormCommon intoDeptObj;
+    @ApiModelProperty("调入部门sid")
+    private String intoDeptSid; // 调入部门sid
+    @ApiModelProperty("调入部门")
+    private String intoDept; // 调入部门
+
+    private FormCommon pullDeptObj;
+    @ApiModelProperty("调出部门sid")
+    private String pullDeptSid; // 调出部门sid
+    @ApiModelProperty("调出部门")
+    private String pullDept; // 调出部门
+
+    @ApiModelProperty("调拨事由")
+    private String allocateReason; // 调拨事由
+    @ApiModelProperty("调拨资产金额合计")
+    private String totalAmount; // 调拨资产金额合计
+
+    @ApiModelProperty("图片")
+    private List<String> files = new ArrayList<>();
+    @ApiModelProperty("附件")
+    private List<String> appes = new ArrayList<>();
+
+    private List<AdAllocateAssetDetailsVo> list = new ArrayList<>();
+
+    private String taskId;
+    @ApiModelProperty("流程实例id")
+    private String procInsId;
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetails.java

@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetdetails;
+
+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_allocate_asset_details")
+public class AdAllocateAssetDetails extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("申请sid")
+    private String mainSid; // 申请sid
+    @ApiModelProperty("库存sid")
+    private String inventorySid; // 库存sid
+    @ApiModelProperty("固定资产ID")
+    private String goodsID; // 固定资产ID
+    @ApiModelProperty("固定资产编号")
+    private String goodsSkuCode; // 固定资产编号
+    @ApiModelProperty("固定资产名称")
+    private String goodsSpuName; // 固定资产名称
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("固定资产情况说明")
+    private String goodsShows; // 固定资产情况说明
+    @ApiModelProperty("固定资产净值")
+    private BigDecimal goodsWorth; // 固定资产净值
+
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsDto.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetdetails;
+
+
+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(认定人员) <br/>
+ * File: AdExpatriatesDetailVo.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
+ * Description: 驻外人员认定列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象")
+public class AdAllocateAssetDetailsDto implements Vo {
+
+    @ApiModelProperty("固定资产")
+    private FormCommon assetObj;
+
+    @ApiModelProperty("库存sid")
+    private String inventorySid; // 库存sid
+    @ApiModelProperty("固定资产ID")
+    private String goodsID; // 固定资产ID
+    @ApiModelProperty("固定资产编号")
+    private String goodsSkuCode; // 固定资产编号
+    @ApiModelProperty("固定资产名称")
+    private String goodsSpuName; // 固定资产名称
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("固定资产情况说明")
+    private String goodsShows; // 固定资产情况说明
+    @ApiModelProperty("固定资产净值")
+    private String goodsWorth; // 固定资产净值
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsMapper.java

@@ -0,0 +1,41 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetdetails;
+
+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 AdAllocateAssetDetailsMapper extends BaseMapper<AdAllocateAssetDetails> {
+
+    @Select("select * from ad_allocate_asset_details where mainSid = #{mainSid}")
+    List<AdAllocateAssetDetails> selectByMainSid(String mainSid);
+
+    List<AdAllocateAssetDetailsVo> getUpdateInit(String sid);
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsMapper.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsMapper">
+    <select id="getUpdateInit" resultType="com.yxt.anrui.oa.biz.adallocateassetdetails.AdAllocateAssetDetailsVo">
+        select *
+        from ad_allocate_asset_details
+        where mainSid = #{sid}
+    </select>
+</mapper>

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsService.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetdetails;
+
+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 AdAllocateAssetDetailsService extends MybatisBaseService<AdAllocateAssetDetailsMapper, AdAllocateAssetDetails> {
+
+    public void saveDetails(List<AdAllocateAssetDetailsDto> list, String sid) {
+        //根据sid查询明细并删除
+        List<AdAllocateAssetDetails> 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 -> {
+                AdAllocateAssetDetails adAllocateAssetDetails = new AdAllocateAssetDetails();
+                BeanUtil.copyProperties(details, adAllocateAssetDetails);
+                adAllocateAssetDetails.setMainSid(sid);
+                FormCommon assetObj = details.getAssetObj();
+                adAllocateAssetDetails.setGoodsID(assetObj.getDictValue());
+                adAllocateAssetDetails.setInventorySid(assetObj.getId());
+                Map<String, Object> extra = assetObj.getExtra();
+                if (null != extra) {
+                    for (Map.Entry <String,Object>  entry : extra.entrySet()) {
+                        if (StringUtils.isNotBlank((String)entry.getValue())) {
+                            if (entry.getKey().equals("goodsSpuName")) {
+                                adAllocateAssetDetails.setGoodsSpuName((String)entry.getValue());
+                            }
+                            if (entry.getKey().equals("goodsSkuOwnSpec")) {
+                                adAllocateAssetDetails.setGoodsSkuOwnSpec((String)entry.getValue());
+                            }
+                            if (entry.getKey().equals("goodsSkuCode")) {
+                                adAllocateAssetDetails.setGoodsSkuCode((String)entry.getValue());
+                            }
+                        }
+                    }
+                }
+                baseMapper.insert(adAllocateAssetDetails);
+            });
+        }
+    }
+
+    public List<AdAllocateAssetDetailsVo> getUpdateInit(String sid) {
+        return baseMapper.getUpdateInit(sid);
+    }
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetDetailsVo.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetdetails;
+
+
+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(认定人员) <br/>
+ * File: AdExpatriatesDetailVo.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
+ * Description: 驻外人员认定列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象")
+public class AdAllocateAssetDetailsVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("固定资产")
+    private FormCommon assetObj;
+
+    @ApiModelProperty("库存sid")
+    private String inventorySid; // 库存sid
+    @ApiModelProperty("固定资产ID")
+    private String goodsID; // 固定资产ID
+    @ApiModelProperty("固定资产编号")
+    private String goodsSkuCode; // 固定资产编号
+    @ApiModelProperty("固定资产名称")
+    private String goodsSpuName; // 固定资产名称
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("固定资产情况说明")
+    private String goodsShows; // 固定资产情况说明
+    @ApiModelProperty("固定资产净值")
+    private String goodsWorth; // 固定资产净值
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adallocateassetdetails/AdAllocateAssetListDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.oa.biz.adallocateassetdetails;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-oa(认定人员) <br/>
+ * File: AdExpatriatesDetailVo.java <br/>
+ * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
+ * Description: 驻外人员认定列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2025-01-20 15:35:08 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "固定资产列表 视图数据对象", description = "固定资产列表 视图数据对象")
+public class AdAllocateAssetListDetailsVo implements Vo {
+
+    private String sid;
+
+    @ApiModelProperty("固定资产ID")
+    private String goodsID; // 固定资产ID
+    @ApiModelProperty("固定资产编号")
+    private String goodsSkuCode; // 固定资产编号
+    @ApiModelProperty("固定资产名称")
+    private String goodsSpuName; // 固定资产名称
+    @ApiModelProperty("规格型号")
+    private String goodsSkuOwnSpec; // 规格型号
+    @ApiModelProperty("固定资产情况说明")
+    private String goodsShows; // 固定资产情况说明
+    @ApiModelProperty("固定资产净值")
+    private String goodsWorth; // 固定资产净值
+
+}

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetapply/AdPurchaseAssetApplyService.java

@@ -92,7 +92,7 @@ public class AdPurchaseAssetApplyService extends MybatisBaseService<AdPurchaseAs
         if (!list.isEmpty()) {
             list.stream().forEach(details -> {
                 FormCommon assetObj = new FormCommon();
-                assetObj.setId(details.getSid());
+                assetObj.setId(details.getGoodsSpuSid());
                 assetObj.setDictValue(details.getGoodsSkuCode());
                 Map<String, Object> extra = new HashMap<>();
                 if (StringUtils.isNotBlank(details.getGoodsSpuName())) {
@@ -147,8 +147,8 @@ public class AdPurchaseAssetApplyService extends MybatisBaseService<AdPurchaseAs
         }
         adPurchaseAssetDetailsService.saveDetails(list, sid);
         // 处理附件
-        saveFiles(sid, files, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "图片");
+        saveFiles(sid, files, OaFileEnum.ADPURCHASEASSETAPPLY.getAttachType(), "图片");
-        saveFiles(sid, appes, OaFileEnum.ADEXPATRIATESAPPLY.getAttachType(), "文件");
+        saveFiles(sid, appes, OaFileEnum.ADPURCHASEASSETAPPLY.getAttachType(), "文件");
         return rb.success().setData(sid);
     }
 
@@ -171,17 +171,17 @@ public class AdPurchaseAssetApplyService extends MybatisBaseService<AdPurchaseAs
 
     public ResultBean<AdPurchaseAssetApplyDetailVo> details(String sid, String application) {
         ResultBean<AdPurchaseAssetApplyDetailVo> rb = ResultBean.fireFail();
-        AdPurchaseAssetApplyDetailVo adExpatriatesApplyDetailVo = baseMapper.details(sid);
+        AdPurchaseAssetApplyDetailVo adPurchaseAssetApplyDetailVo = baseMapper.details(sid);
-        if (adExpatriatesApplyDetailVo == null) {
+        if (adPurchaseAssetApplyDetailVo == null) {
             return rb.setMsg("该申请不存在");
         }
         List<String> files = oaAppendixService.selectByLinkSid(sid, "图片");
         List<String> appes = oaAppendixService.selectByLinkSid(sid, "文件");
-        adExpatriatesApplyDetailVo.setFiles(files);
+        adPurchaseAssetApplyDetailVo.setFiles(files);
-        adExpatriatesApplyDetailVo.setAppes(appes);
+        adPurchaseAssetApplyDetailVo.setAppes(appes);
         //基础字段赋值
-        BeanUtil.copyProperties(oaFormService.getDetails(sid), adExpatriatesApplyDetailVo);
+        BeanUtil.copyProperties(oaFormService.getDetails(sid), adPurchaseAssetApplyDetailVo);
-        return rb.success().setData(adExpatriatesApplyDetailVo);
+        return rb.success().setData(adPurchaseAssetApplyDetailVo);
     }
 
     /**

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsDto.java

@@ -33,14 +33,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
- * Project: yxt-oa(认定人员) <br/>
- * File: AdExpatriatesDetailVo.java <br/>
- * Class: com.yxt.anrui.oa.api.adexpatriatesdetail.AdExpatriatesDetailVo <br/>
- * Description: 驻外人员认定列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2025-01-20 15:35:08 <br/>
- *
  * @author liupopo
  * @version 1.0
  * @since 1.0
@@ -67,4 +59,7 @@ public class AdPurchaseAssetDetailsDto implements Vo {
     private String estimateCount; // 预计采购数量
     @ApiModelProperty("预计采购金额")
     private String estimateMoney; // 预计采购金额
+
+
+
 }

yxt-oa/src/main/java/com/yxt/anrui/oa/biz/adpurchaseassetdetails/AdPurchaseAssetDetailsService.java

@@ -57,8 +57,6 @@ public class AdPurchaseAssetDetailsService extends MybatisBaseService<AdPurchase
                 adPurchaseAssetDetails.setGoodsSkuCode(assetObj.getDictValue());
                 adPurchaseAssetDetails.setGoodsSpuSid(assetObj.getId());
                 Map<String, Object> extra = assetObj.getExtra();
-                adPurchaseAssetDetails.setGoodsSpuSid(assetObj.getId());
-                adPurchaseAssetDetails.setGoodsSkuCode(assetObj.getDictValue());
                 if (null != extra) {
                     for (Map.Entry <String,Object>  entry : extra.entrySet()) {
                         if (StringUtils.isNotBlank((String)entry.getValue())) {

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/file/OaFileEnum.java

@@ -11,6 +11,8 @@ public enum OaFileEnum {
     OAMENDAPPLY("002", "补卡申请附件"),
     ADEXPATRIATESAPPLY("003", "驻外人员认定附件"),
     HIHIREAPPLY("004", "招聘需求附件"),
+    ADPURCHASEASSETAPPLY("005", "固定资产采购附件"),
+    ADALLOCATEASSETAPPLY("006", "固定资产调拨附件"),
     ;
 
 

yxt-oa/src/main/java/com/yxt/anrui/oa/feign/flowable/flow/ProcDefEnum.java

@@ -13,6 +13,8 @@ public enum ProcDefEnum {
     BGYPLYAPPLY("办公用品领用", ""),
     GDZCCG_GS_APPLY("公司固定资产采购申请", ""),
     GDZCCG_ZX_APPLY("中心固定资产采购申请", ""),
+    GDZCDB_GS_APPLY("公司固定资产调拨申请", ""),
+    GDZCDB_ZX_APPLY("中心固定资产调拨申请", ""),
     ;
 
 

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -57,6 +57,9 @@ public class WmsInventoryRest {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<WmsInventoryVo>> listPage(@RequestBody PagerQuery<WmsInventoryQuery> pq) {
         ResultBean<PagerVo<WmsInventoryVo>> rb = ResultBean.fireFail();
+        WmsInventoryQuery params = pq.getParams();
+        params.setType("配件库");
+        pq.setParams(params);
         PagerVo<WmsInventoryVo> pv = wmsInventoryService.listPage(pq);
         return rb.success().setData(pv);
     }

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

@@ -125,13 +125,12 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
                 apply(StringUtils.isNotBlank(query.getFirstInEndDate()), "date_format (a.firstInDate,'%Y-%m-%d') <= date_format('" + query.getFirstInEndDate() + "','%Y-%m-%d')"
                 );
         if (StringUtils.isNotBlank(query.getDateAge())) {
-            qw.apply("DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) <" + query.getDateAge());
+            qw.apply("DATEDIFF(NOW(), DATE_FORMAT( a.firstInDate, '%Y-%m-%d' )) >" + query.getDateAge());
         }
         if (StringUtils.isNotBlank(query.getType())) {
-            if (query.getType().equals("拆件库")) {
+            qw.eq("i.warehouseTypeValue", query.getType());
-                qw.eq("i.warehouseTypeValue", "拆件库");
-            }
         }
+        qw.notLike("a.goodsID","-O");
         IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryVo> pagging = baseMapper.listPage(page, qw);
         PagerVo<WmsInventoryVo> p = PagerUtil.pageToVo(pagging, null);