God 10 months ago
parent
commit
2e45cf1a5b
  1. 86
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/AppInventoryProfitinDetailDetailsVo.java
  2. 83
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/AppInventoryProfitinDetailsVo.java
  3. 73
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/AppInventoryProfitinFeign.java
  4. 25
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/AppDelegateQuery.java
  5. 37
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/InventInDto.java
  6. 28
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/InventInQuery.java
  7. 47
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/InventInTaskQuery.java
  8. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java
  9. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java
  10. 92
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java
  11. 190
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinService.java
  12. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillDetailFile.java
  13. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java
  14. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java
  15. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillFeign.java
  16. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportDetailsVo.java
  17. 2
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportSumVo.java
  18. 86
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/WmsInventoryProfitinDetailDetailsVo.java
  19. 83
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java
  20. 63
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/WmsInventoryProfitinFeign.java
  21. 35
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/CompleteInventoryProfitinDto.java
  22. 23
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinDelegateQuery.java
  23. 18
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinNodeQuery.java
  24. 24
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinNodeVo.java
  25. 43
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinTaskQuery.java
  26. 7
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryProfitinRest.java
  27. 8
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java

86
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/AppInventoryProfitinDetailDetailsVo.java

@ -0,0 +1,86 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.wms.inventoryprofitin;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-wms(盘库) <br/>
* File: WmsInventoryProfitinDetailVo.java <br/>
* Class: com.yxt.wms.api.wmsinventoryprofitindetail.WmsInventoryProfitinDetailVo <br/>
* Description: 盘盈入库-明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-07 16:58:17 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盘盈入库-明细 视图数据详情", description = "盘盈入库-明细 视图数据详情")
public class AppInventoryProfitinDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("主表sid")
private String mainSid;
@ApiModelProperty("图号")
private String goodsCode;
@ApiModelProperty("商品spuSid")
private String goodsSid;
@ApiModelProperty("商品spu名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品sku名称")
private String goodsName;
@ApiModelProperty("规格")
private String goodsSpec;
@ApiModelProperty("入库数量(默认盘盈数量)")
private String inStorageNum;
@ApiModelProperty("入库单价")
private String inStoragePrice;
@ApiModelProperty("盘盈数量")
private String pyNum;
@ApiModelProperty("厂家sid")
private String manufacturerSid;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
private String money;
}

83
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/AppInventoryProfitinDetailsVo.java

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.wms.inventoryprofitin;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@ApiModel(value = "盘盈入库申请 视图数据详情", description = "盘盈入库申请 视图数据详情")
public class AppInventoryProfitinDetailsVo implements Vo {
private String sid; // sid
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("申请人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
@ApiModelProperty("业务类型")
private String businessVaule; // 业务类型
@ApiModelProperty("盘点单sid")
private String sourceBillSid; // 盘点单sid
@ApiModelProperty("盘点单号")
private String sourceBillNo; // 盘点单号
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty
private List<AppInventoryProfitinDetailDetailsVo> goodsList;
}

73
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/AppInventoryProfitinFeign.java

@ -0,0 +1,73 @@
package com.yxt.anrui.terminal.api.wms.inventoryprofitin;
import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.*;
import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInDto;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInTaskQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "terminal-AppInventoryProfitin",
name = "anrui-terminal",
path = "v1/inventorysurplus")
public interface AppInventoryProfitinFeign {
@ApiOperation("编辑回显盘盈入库")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<AppInventoryProfitinDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
/**********************************************流程********************************************/
@ApiOperation("办理")
@PutMapping("/agreeCreditInfo")
@ResponseBody
ResultBean agreeCreditInfo(@RequestBody InventInDto dto);
@ApiOperation("驳回")
@PutMapping("/rejectCreditInfo")
@ResponseBody
ResultBean rejectCreditInfo(@RequestBody InventInTaskQuery query);
@ApiOperation("撤回")
@PutMapping("/recallCreditInfo")
@ResponseBody
ResultBean recallCreditInfo(@RequestBody InventInTaskQuery query);
@ApiOperation("终止")
@PutMapping("/stopCreditInfo")
@ResponseBody
ResultBean stopCreditInfo(@RequestBody InventInTaskQuery query);
@ApiOperation("获取流程操作标题")
@GetMapping("/getFlowOperateTitle")
@ResponseBody
ResultBean<String> getFlowOperateTitle(@SpringQueryMap InventInQuery query);
@ApiOperation(value = "加签")
@PutMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody AppDelegateQuery delegateQuery);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody AppDelegateQuery delegateQuery);
}

25
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/AppDelegateQuery.java

@ -0,0 +1,25 @@
package com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/28 10:16
*/
@Data
public class AppDelegateQuery {
@ApiModelProperty
private String userSid;
@ApiModelProperty("流程实例id")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

37
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/InventInDto.java

@ -0,0 +1,37 @@
package com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:09
* @Description
*/
@Data
public class InventInDto implements Dto {
private static final long serialVersionUID = 3626473483180150495L;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:procInsId")
@JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
}

28
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/InventInQuery.java

@ -0,0 +1,28 @@
package com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:15
* @Description
*/
@Data
public class InventInQuery implements Query {
private static final long serialVersionUID = 5514095179438249641L;
@ApiModelProperty(value = "节点key")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "0 上一环节 1下一环节")
@NotNull(message = "参数错误:next")
private Integer next;
@ApiModelProperty("组织机构全路径")
private String orgPath;
}

47
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventoryprofitin/flowable/InventInTaskQuery.java

@ -0,0 +1,47 @@
package com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/8/9 14:11
* @Description
*/
@Data
public class InventInTaskQuery implements Query {
private static final long serialVersionUID = -7082170710942810289L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
@JsonProperty("procInsId")
private String instanceId;
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
"com.yxt.anrui.terminal",
"com.yxt.common.base.config"
},exclude = {DataSourceAutoConfiguration.class})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin","com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo"})
@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo"})
public class TerminalApplication {
public static void main(String[] args) {

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java

@ -30,7 +30,7 @@ import com.yxt.anrui.terminal.fegin.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.anrui.terminal.fegin.basegoodssku.GoodsDeptVo;
import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoChoice;
import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoFeign;
import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.*;
import com.yxt.anrui.terminal.fegin.wmsinventorycheckbill.*;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;

92
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinRest.java

@ -0,0 +1,92 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.wms.inventoryprofitin;
import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinDetailsVo;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinFeign;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInDto;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInTaskQuery;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@Api(tags = "售后盘盈入库")
@RestController
@RequestMapping("v1/inventorysurplus")
public class WmsInventoryProfitinRest implements AppInventoryProfitinFeign {
@Autowired
private WmsInventoryProfitinService wmsInventoryProfitinService;
@Override
public ResultBean<AppInventoryProfitinDetailsVo> fetchDetailsBySid(String sid) {
return wmsInventoryProfitinService.fetchDetailsBySid(sid);
}
@Override
public ResultBean agreeCreditInfo(InventInDto dto) {
return wmsInventoryProfitinService.agreeCreditInfo(dto);
}
@Override
public ResultBean rejectCreditInfo(InventInTaskQuery query) {
return wmsInventoryProfitinService.rejectCreditInfo(query);
}
@Override
public ResultBean recallCreditInfo(InventInTaskQuery query) {
return wmsInventoryProfitinService.recallCreditInfo(query);
}
@Override
public ResultBean stopCreditInfo(InventInTaskQuery query) {
return wmsInventoryProfitinService.stopCreditInfo(query);
}
@Override
public ResultBean<String> getFlowOperateTitle(InventInQuery query) {
return wmsInventoryProfitinService.getFlowOperateTitle(query);
}
@Override
public ResultBean delegate(AppDelegateQuery delegateQuery) {
return wmsInventoryProfitinService.delegate(delegateQuery);
}
@Override
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
return wmsInventoryProfitinService.assignTask(delegateQuery);
}
}

190
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventoryprofitin/WmsInventoryProfitinService.java

@ -0,0 +1,190 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.wms.inventoryprofitin;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.*;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinDetailDetailsVo;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.AppInventoryProfitinDetailsVo;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.AppDelegateQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInDto;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInQuery;
import com.yxt.anrui.terminal.api.wms.inventoryprofitin.flowable.InventInTaskQuery;
import com.yxt.anrui.terminal.fegin.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.anrui.terminal.fegin.basegoodssku.GoodsDeptVo;
import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoChoice;
import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoFeign;
import com.yxt.anrui.terminal.fegin.wmsinventorycheckbill.*;
import com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.WmsInventoryProfitinDetailsVo;
import com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.WmsInventoryProfitinFeign;
import com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable.*;
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@Service
public class WmsInventoryProfitinService {
@Resource
private WmsInventoryProfitinFeign wmsInventoryProfitinFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
public ResultBean<AppInventoryProfitinDetailsVo> fetchDetailsBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryProfitinDetailsVo data = wmsInventoryProfitinFeign.fetchDetailsBySid(sid).getData();
AppInventoryProfitinDetailsVo appInventoryProfitinDetailsVo = new AppInventoryProfitinDetailsVo();
BeanUtil.copyProperties(data,appInventoryProfitinDetailsVo);
appInventoryProfitinDetailsVo.setBusinessVaule(data.getBusinessValue());
List<AppInventoryProfitinDetailDetailsVo> goodsList = appInventoryProfitinDetailsVo.getGoodsList();
for (AppInventoryProfitinDetailDetailsVo appInventoryProfitinDetailDetailsVo : goodsList) {
appInventoryProfitinDetailDetailsVo.setMoney(new BigDecimal(appInventoryProfitinDetailDetailsVo.getInStoragePrice()).multiply(new BigDecimal(appInventoryProfitinDetailDetailsVo.getInStorageNum())).setScale(2, RoundingMode.HALF_UP).toString());
}
return rb.success().setData(appInventoryProfitinDetailsVo);
}
public ResultBean agreeCreditInfo(InventInDto dto) {
ResultBean rb = ResultBean.fireFail();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
CompleteInventoryProfitinDto completeInventoryProfitinDto = new CompleteInventoryProfitinDto();
BeanUtil.copyProperties(dto, completeInventoryProfitinDto);
completeInventoryProfitinDto.setOrgSidPath(orgSidPath);
ResultBean resultBean = wmsInventoryProfitinFeign.complete(completeInventoryProfitinDto);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean rejectCreditInfo(InventInTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
InventoryProfitinTaskQuery inventoryProfitinTaskQuery = new InventoryProfitinTaskQuery();
BeanUtil.copyProperties(query, inventoryProfitinTaskQuery);
ResultBean resultBean = wmsInventoryProfitinFeign.taskReject(inventoryProfitinTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean recallCreditInfo(InventInTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
InventoryProfitinTaskQuery inventoryProfitinTaskQuery = new InventoryProfitinTaskQuery();
BeanUtil.copyProperties(query, inventoryProfitinTaskQuery);
ResultBean resultBean = wmsInventoryProfitinFeign.revokeProcess(inventoryProfitinTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean stopCreditInfo(InventInTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
InventoryProfitinTaskQuery inventoryProfitinTaskQuery = new InventoryProfitinTaskQuery();
BeanUtil.copyProperties(query, inventoryProfitinTaskQuery);
ResultBean resultBean = wmsInventoryProfitinFeign.breakProcess(inventoryProfitinTaskQuery);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
return rb.success().setData(resultBean.getData());
}
public ResultBean<String> getFlowOperateTitle(InventInQuery query) {
ResultBean<String> rb = ResultBean.fireFail();
//0 上一环节 1下一环节
int next = query.getNext();
InventoryProfitinNodeQuery getNodeQuery = new InventoryProfitinNodeQuery();
BeanUtil.copyProperties(query, getNodeQuery);
String data = "";
if (next == 0) {
ResultBean<List<InventoryProfitinNodeVo>> getPreviousNodesForReject = wmsInventoryProfitinFeign.getPreviousNodesForReject(getNodeQuery);
if (getPreviousNodesForReject.getSuccess()) {
getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
data = getPreviousNodesForReject.getData().get(0).getName();
} else {
return rb.setMsg(getPreviousNodesForReject.getMsg());
}
} else if (next == 1) {
ResultBean<List<InventoryProfitinNodeVo>> getNextNodesForSubmit = wmsInventoryProfitinFeign.getNextNodesForSubmit(getNodeQuery);
if (getNextNodesForSubmit.getSuccess()) {
getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
data = getNextNodesForSubmit.getData().get(0).getName();
} else {
return rb.setMsg(getNextNodesForSubmit.getMsg());
}
} else {
return rb.setMsg("参数错误:next");
}
return rb.success().setData(data);
}
public ResultBean delegate(AppDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
InventoryProfitinDelegateQuery delegateQuery1 = new
InventoryProfitinDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
wmsInventoryProfitinFeign.delegate(delegateQuery1);
return rb.success();
}
public ResultBean assignTask(AppDelegateQuery delegateQuery) {
ResultBean rb = ResultBean.fireFail();
InventoryProfitinDelegateQuery delegateQuery1 = new
InventoryProfitinDelegateQuery();
BeanUtil.copyProperties(delegateQuery, delegateQuery1);
wmsInventoryProfitinFeign.assignTask(delegateQuery1);
return rb.success();
}
}

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailFile.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillDetailFile.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
import com.yxt.common.core.vo.Vo;
import lombok.Data;

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
import com.yxt.common.core.query.Query;

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillDetailRackGoodPageListVo.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
import com.yxt.common.core.vo.Vo;

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillFeign.java

@ -1,4 +1,4 @@
package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
import com.yxt.common.core.query.PagerQuery;

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillReportDetailsVo.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportDetailsVo.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
import com.fasterxml.jackson.annotation.JsonFormat;

2
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillReportSumVo.java → anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportSumVo.java

@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
package com.yxt.anrui.terminal.fegin.wmsinventorycheckbill;
import com.yxt.common.core.vo.Vo;

86
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/WmsInventoryProfitinDetailDetailsVo.java

@ -0,0 +1,86 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: yxt-wms(盘库) <br/>
* File: WmsInventoryProfitinDetailVo.java <br/>
* Class: com.yxt.wms.api.wmsinventoryprofitindetail.WmsInventoryProfitinDetailVo <br/>
* Description: 盘盈入库-明细 视图数据对象. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2024-08-07 16:58:17 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Data
@ApiModel(value = "盘盈入库-明细 视图数据详情", description = "盘盈入库-明细 视图数据详情")
public class WmsInventoryProfitinDetailDetailsVo implements Vo {
private String sid; // sid
@ApiModelProperty("主表sid")
private String mainSid;
@ApiModelProperty("图号")
private String goodsCode;
@ApiModelProperty("商品spuSid")
private String goodsSid;
@ApiModelProperty("商品spu名称")
private String goodsSpuName;
@ApiModelProperty("商品Skusid")
private String goodsSkuSid;
@ApiModelProperty("商品sku名称")
private String goodsName;
@ApiModelProperty("规格")
private String goodsSpec;
@ApiModelProperty("入库数量(默认盘盈数量)")
private String inStorageNum;
@ApiModelProperty("入库单价")
private String inStoragePrice;
@ApiModelProperty("盘盈数量")
private String pyNum;
@ApiModelProperty("厂家sid")
private String manufacturerSid;
@ApiModelProperty("厂家名称")
private String manufacturerName;
@ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("供应商sid")
private String supplierSid; // 供应商sid
@ApiModelProperty("供应商名称")
private String supplierName; // 供应商名称
private String money;
}

83
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/WmsInventoryProfitinDetailsVo.java

@ -0,0 +1,83 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
@Data
@ApiModel(value = "盘盈入库申请 视图数据详情", description = "盘盈入库申请 视图数据详情")
public class WmsInventoryProfitinDetailsVo implements Vo {
private String sid; // sid
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("申请日期")
private Date createTime;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("申请人sid")
private String createBySid;
@ApiModelProperty("制单人姓名")
private String createByName; // 制单人姓名
@ApiModelProperty("申请部门sid")
private String deptSid; // 申请部门sid
@ApiModelProperty("申请部门名称")
private String deptName; // 申请部门名称
@ApiModelProperty("业务类型")
private String businessValue; // 业务类型
@ApiModelProperty("盘点单sid")
private String sourceBillSid; // 盘点单sid
@ApiModelProperty("盘点单号")
private String sourceBillNo; // 盘点单号
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间
@ApiModelProperty("流程定义的id")
private String procDefId; // 流程定义的id
@ApiModelProperty("环节定义的sid")
private String nodeId; // 环节定义的sid
@ApiModelProperty("流程实例的sid")
private String procInstId; // 流程实例的sid
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@ApiModelProperty("创建组织名称")
private String createOrgName; // 创建组织名称
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
@ApiModelProperty
private List<WmsInventoryProfitinDetailDetailsVo> goodsList;
}

63
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/WmsInventoryProfitinFeign.java

@ -0,0 +1,63 @@
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin;
import com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable.*;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* @Author
* @Date
* @Description
*/
@Api(tags = "售后盘盈入库")
@FeignClient(
contextId = "yxt-wms-WmsInventoryProfitin",
name = "yxt-wms",
path = "v1/wmsinventorysurplus")
public interface WmsInventoryProfitinFeign {
@ApiOperation("编辑回显盘盈入库")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryProfitinDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody CompleteInventoryProfitinDto query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<InventoryProfitinNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap InventoryProfitinNodeQuery query);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<InventoryProfitinNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap InventoryProfitinNodeQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@Valid @RequestBody InventoryProfitinTaskQuery query);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@Valid @RequestBody InventoryProfitinTaskQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@Valid @RequestBody InventoryProfitinTaskQuery query);
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
@ResponseBody
public ResultBean delegate(@RequestBody InventoryProfitinDelegateQuery query);
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody InventoryProfitinDelegateQuery query);
}

35
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/CompleteInventoryProfitinDto.java

@ -0,0 +1,35 @@
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/11
**/
@Data
public class CompleteInventoryProfitinDto {
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
}

23
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinDelegateQuery.java

@ -0,0 +1,23 @@
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/11
**/
@Data
public class InventoryProfitinDelegateQuery {
private String userSid;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

18
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinNodeQuery.java

@ -0,0 +1,18 @@
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/11
**/
@Data
public class InventoryProfitinNodeQuery {
@ApiModelProperty(value = "环节定义id")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
}

24
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinNodeVo.java

@ -0,0 +1,24 @@
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/11
**/
@Data
public class InventoryProfitinNodeVo {
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

43
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventoryprofitin/flowable/InventoryProfitinTaskQuery.java

@ -0,0 +1,43 @@
package com.yxt.anrui.terminal.fegin.wmsinventoryprofitin.flowable;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @description:
* @author: dimengzhe
* @date: 2024/5/11
**/
@Data
public class InventoryProfitinTaskQuery {
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
}

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

@ -146,4 +146,11 @@ public class WmsInventoryProfitinRest {
public ResultBean delegate(@RequestBody InventoryProfitinDelegateQuery query) {
return wmsInventoryProfitinService.delegate(query);
}
@ApiOperation(value = "转办")
@PutMapping(value = "/assignTask")
@ResponseBody
public ResultBean assignTask(@RequestBody InventoryProfitinDelegateQuery query){
return wmsInventoryProfitinService.assignTask(query);
}
}

8
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java

@ -616,6 +616,14 @@ public class WmsInventoryProfitinService extends MybatisBaseService<WmsInventory
return rb.success();
}
public ResultBean assignTask(InventoryProfitinDelegateQuery query) {
ResultBean rb = ResultBean.fireFail();
FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
BeanUtil.copyProperties(query, delegateQuery);
flowFeign.assignTask(delegateQuery);
return rb.success();
}
public List<InventoryBillVo> getSourceBillNoBySid(String deptSid) {
return wmsInventoryCheckbillService.selPyByDeptSid(deptSid);
}

Loading…
Cancel
Save