diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java index fbd5d595e9..92ba5a10bd 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowcc/SysFlowccService.java @@ -64,9 +64,9 @@ public class SysFlowccService extends MybatisBaseService listPageVo(PagerQuery pq) { SysFlowccQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - /* if (StringUtils.isNotBlank(query.getFlowName())) { + if (StringUtils.isNotBlank(query.getFlowName())) { qw.like("flowName", query.getFlowName()); - }*/ + } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillDetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillDetailDetailsVo.java new file mode 100644 index 0000000000..48040d957c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillDetailDetailsVo.java @@ -0,0 +1,55 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.sms.pricestrategybill; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +@ApiModel(value = "价格策略申请明细 视图数据详情", description = "价格策略申请明细 视图数据详情") +public class AppPricestrategyBillDetailDetailsVo implements Vo { + + @ApiModelProperty("商品类别编码") + private String goodsTypeCode; + @ApiModelProperty("商品类别名称") + private String goodsTypeName; + @ApiModelProperty("价格策略类别(固定比例1、价格区间2)") + private Integer strategyType; + @ApiModelProperty("价格策略类别(固定比例1、价格区间2)") + private String strategyType2; + @ApiModelProperty("策略描述") + private String strategyDescribe; + @ApiModelProperty("加价比例") + private BigDecimal gdMarkupRate; + + @ApiModelProperty("价格策略区间") + private List smsPricestrategyBillGoodstypedetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillDetailsVo.java new file mode 100644 index 0000000000..c69a3739de --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillDetailsVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.sms.pricestrategybill; + + +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; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategyBillVo.java
+ * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo
+ * Description: 价格策略申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "价格策略申请 视图数据详情", description = "价格策略申请 视图数据详情") +public class AppPricestrategyBillDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; + @ApiModelProperty("制单人姓名") + private String createByName; + @ApiModelProperty("申请部门名称") + private String deptName; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("价格策略明细") + private List smsPricestrategyBillDetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java new file mode 100644 index 0000000000..23f6a05d52 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillFeign.java @@ -0,0 +1,59 @@ +package com.yxt.anrui.terminal.api.sms.pricestrategybill; + +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillDto; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillQuery; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillTaskQuery; +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; +import org.springframework.web.bind.annotation.*; + +@FeignClient( + contextId = "terminal-AppPricestrategyBill", + name = "anrui-terminal", + path = "v1/smspricestrategybill") +public interface AppPricestrategyBillFeign { + + @ApiOperation("编辑回显盘盈入库") + @GetMapping("/fetchDetailsBySid2/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + /**********************************************流程********************************************/ + + @ApiOperation("办理") + @PutMapping("/agreeCreditInfo") + @ResponseBody + ResultBean agreeCreditInfo(@RequestBody PricestrategyBillDto dto); + + @ApiOperation("驳回") + @PutMapping("/rejectCreditInfo") + @ResponseBody + ResultBean rejectCreditInfo(@RequestBody PricestrategyBillTaskQuery query); + + @ApiOperation("撤回") + @PutMapping("/recallCreditInfo") + @ResponseBody + ResultBean recallCreditInfo(@RequestBody PricestrategyBillTaskQuery query); + + @ApiOperation("终止") + @PutMapping("/stopCreditInfo") + @ResponseBody + ResultBean stopCreditInfo(@RequestBody PricestrategyBillTaskQuery query); + + @ApiOperation("获取流程操作标题") + @GetMapping("/getFlowOperateTitle") + @ResponseBody + ResultBean getFlowOperateTitle(@SpringQueryMap PricestrategyBillQuery 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); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillGoodstypedetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillGoodstypedetailDetailsVo.java new file mode 100644 index 0000000000..5095972735 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/AppPricestrategyBillGoodstypedetailDetailsVo.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.sms.pricestrategybill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategyBillGoodstypedetailVo.java
+ * Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo
+ * Description: 价格策略商品类别明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "价格策略商品类别明细 视图数据详情", description = "价格策略商品类别明细 视图数据详情") +public class AppPricestrategyBillGoodstypedetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("业务sid") + private String detailSid; // 业务sid + @ApiModelProperty("区间起始") + private BigDecimal rangeStart; // 区间起始 + @ApiModelProperty("区间截止") + private BigDecimal rangeEnd; // 区间截止 + @ApiModelProperty("加价比例") + private BigDecimal markupRate; // 加价比例 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/AppDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/AppDelegateQuery.java new file mode 100644 index 0000000000..9c47bebc88 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/AppDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.sms.pricestrategybill.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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillDto.java new file mode 100644 index 0000000000..24c2222ff4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.api.sms.pricestrategybill.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 PricestrategyBillDto 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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillQuery.java new file mode 100644 index 0000000000..ac649b4665 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.terminal.api.sms.pricestrategybill.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 PricestrategyBillQuery 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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillTaskQuery.java new file mode 100644 index 0000000000..98af16e48e --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/sms/pricestrategybill/flowable/PricestrategyBillTaskQuery.java @@ -0,0 +1,47 @@ +package com.yxt.anrui.terminal.api.sms.pricestrategybill.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 PricestrategyBillTaskQuery 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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillReportDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillReportDetailsVo.java index 3022ed6ede..b88eac8e1a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillReportDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillReportDetailsVo.java @@ -55,6 +55,11 @@ public class AppInventoryCheckbillReportDetailsVo implements Vo { private String remarks; @ApiModelProperty("pdf路径") private String pdfUrl; + @ApiModelProperty("明细下载路径") + private String detailUrl; + + private String taskId; + private String procInsId; //总体盘点情况 @ApiModelProperty("应盘数量") @@ -77,6 +82,10 @@ public class AppInventoryCheckbillReportDetailsVo implements Vo { private BigDecimal lossCountTotal; @ApiModelProperty("盘损金额") private BigDecimal lossAmountTotal; + @ApiModelProperty("虚拟件数量") + private BigDecimal virtualNum; + @ApiModelProperty("未入库数量") + private BigDecimal unInStorageNum; //仓库盘点情况 List ware = new ArrayList<>(); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index f6f513d1ae..f25f9a5697 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/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.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill"}) +@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.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill"}) public class TerminalApplication { public static void main(String[] args) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillRest.java new file mode 100644 index 0000000000..79cbfc35b4 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillRest.java @@ -0,0 +1,85 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.sms.pricestrategybill; + +import com.yxt.anrui.terminal.api.sms.pricestrategybill.AppPricestrategyBillDetailsVo; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.AppPricestrategyBillFeign; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillDto; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillQuery; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillTaskQuery; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("v1/smspricestrategybill") +public class AppPricestrategyBillRest implements AppPricestrategyBillFeign { + + @Autowired + private AppPricestrategyBillService appPricestrategyBillService; + + @Override + public ResultBean fetchDetailsBySid(String sid) { + return appPricestrategyBillService.fetchDetailsBySid(sid); + } + + @Override + public ResultBean agreeCreditInfo(PricestrategyBillDto dto) { + return appPricestrategyBillService.agreeCreditInfo(dto); + } + + @Override + public ResultBean rejectCreditInfo(PricestrategyBillTaskQuery query) { + return appPricestrategyBillService.rejectCreditInfo(query); + } + + @Override + public ResultBean recallCreditInfo(PricestrategyBillTaskQuery query) { + return appPricestrategyBillService.recallCreditInfo(query); + } + + @Override + public ResultBean stopCreditInfo(PricestrategyBillTaskQuery query) { + return appPricestrategyBillService.stopCreditInfo(query); + } + + @Override + public ResultBean getFlowOperateTitle(PricestrategyBillQuery query) { + return appPricestrategyBillService.getFlowOperateTitle(query); + } + + @Override + public ResultBean delegate(AppDelegateQuery delegateQuery) { + return appPricestrategyBillService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + return appPricestrategyBillService.assignTask(delegateQuery); + } +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java new file mode 100644 index 0000000000..45600c0309 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/sms/pricestrategybill/AppPricestrategyBillService.java @@ -0,0 +1,186 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.biz.sms.pricestrategybill; + +import cn.hutool.core.bean.BeanUtil; +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.sms.pricestrategybill.AppPricestrategyBillDetailDetailsVo; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.AppPricestrategyBillDetailsVo; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.AppPricestrategyBillGoodstypedetailDetailsVo; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.AppDelegateQuery; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillDto; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillQuery; +import com.yxt.anrui.terminal.api.sms.pricestrategybill.flowable.PricestrategyBillTaskQuery; +import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillDetailsVo; +import com.yxt.anrui.terminal.fegin.smspricestrategybill.SmsPricestrategyBillFeign; +import com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable.*; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class AppPricestrategyBillService { + + @Resource + private SmsPricestrategyBillFeign smsPricestrategyBillFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserFeign sysUserFeign; + + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillDetailsVo data = smsPricestrategyBillFeign.fetchDetailsBySid(sid).getData(); + AppPricestrategyBillDetailsVo appPricestrategyBillDetailsVo = new AppPricestrategyBillDetailsVo(); + BeanUtil.copyProperties(data,appPricestrategyBillDetailsVo); + appPricestrategyBillDetailsVo.setProcInsId(data.getProcInstId()); + for (AppPricestrategyBillDetailDetailsVo appPricestrategyBillDetailDetailsVo : appPricestrategyBillDetailsVo.getSmsPricestrategyBillDetailList()) { + appPricestrategyBillDetailDetailsVo.setStrategyType2(appPricestrategyBillDetailDetailsVo.getStrategyType() == 1 ? "固定比例" : "价格区间"); + List appPricestrategyBillGoodstypedetailDetailsVos = appPricestrategyBillDetailDetailsVo.getSmsPricestrategyBillGoodstypedetailList(); + if (appPricestrategyBillDetailDetailsVo.getStrategyType() == 1){ + appPricestrategyBillDetailDetailsVo.setStrategyDescribe(appPricestrategyBillDetailDetailsVo.getGdMarkupRate().toString()); + }else { + String strategyDescribe = ""; + for (AppPricestrategyBillGoodstypedetailDetailsVo appPricestrategyBillGoodstypedetailDetailsVo : appPricestrategyBillGoodstypedetailDetailsVos) { + strategyDescribe = strategyDescribe + appPricestrategyBillGoodstypedetailDetailsVo.getRangeStart() + "——" + appPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd() + " " + appPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate() + "; "; + } + appPricestrategyBillDetailDetailsVo.setStrategyDescribe(strategyDescribe); + } + } + return rb.success().setData(appPricestrategyBillDetailsVo); + } + + public ResultBean agreeCreditInfo(PricestrategyBillDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + SmsPricestrategyBillCompleteDto completeInventoryProfitinDto = new SmsPricestrategyBillCompleteDto(); + BeanUtil.copyProperties(dto, completeInventoryProfitinDto); + completeInventoryProfitinDto.setOrgPath(orgSidPath); + ResultBean resultBean = smsPricestrategyBillFeign.complete(completeInventoryProfitinDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean rejectCreditInfo(PricestrategyBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillTaskQuery pricestrategyBillTaskQuery = new SmsPricestrategyBillTaskQuery(); + BeanUtil.copyProperties(query, pricestrategyBillTaskQuery); + ResultBean resultBean = smsPricestrategyBillFeign.reject(pricestrategyBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean recallCreditInfo(PricestrategyBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillTaskQuery pricestrategyBillTaskQuery = new SmsPricestrategyBillTaskQuery(); + BeanUtil.copyProperties(query, pricestrategyBillTaskQuery); + ResultBean resultBean = smsPricestrategyBillFeign.revokeProcess(pricestrategyBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean stopCreditInfo(PricestrategyBillTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillTaskQuery pricestrategyBillTaskQuery = new SmsPricestrategyBillTaskQuery(); + BeanUtil.copyProperties(query, pricestrategyBillTaskQuery); + ResultBean resultBean = smsPricestrategyBillFeign.breakProcess(pricestrategyBillTaskQuery); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success().setData(resultBean.getData()); + } + + public ResultBean getFlowOperateTitle(PricestrategyBillQuery query) { + ResultBean rb = ResultBean.fireFail(); + //0 上一环节 1下一环节 + int next = query.getNext(); + SmsPricestrategyBillNodeQuery getNodeQuery = new SmsPricestrategyBillNodeQuery(); + BeanUtil.copyProperties(query, getNodeQuery); + String data = ""; + if (next == 0) { + ResultBean> getPreviousNodesForReject = smsPricestrategyBillFeign.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> getNextNodesForSubmit = smsPricestrategyBillFeign.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(); + SmsPricestrategyBillDelegateQuery delegateQuery1 = new + SmsPricestrategyBillDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + smsPricestrategyBillFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(AppDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + SmsPricestrategyBillDelegateQuery delegateQuery1 = new + SmsPricestrategyBillDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + smsPricestrategyBillFeign.assignTask(delegateQuery1); + return rb.success(); + } +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java index b780f5a2d5..89f02d584c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java @@ -82,4 +82,9 @@ public class WmsInventoryCheckbillRest implements AppInventoryCheckbillFeign { public ResultBean viewReport(String sid) { return wmsInventoryCheckbillService.viewReport(sid); } + + @Override + public ResultBean viewReportOld(String sid) { + return wmsInventoryCheckbillService.viewReportOld(sid); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java index d25126c198..2f49b59340 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java @@ -35,6 +35,7 @@ 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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -170,7 +171,12 @@ public class WmsInventoryCheckbillService { ResultBean rb = ResultBean.fireFail(); WmsInventoryCheckbillReportDetailsVo data = wmsInventoryCheckbillFeign.viewReport(sid).getData(); AppInventoryCheckbillReportDetailsVo appInventoryCheckbillReportDetailsVo = new AppInventoryCheckbillReportDetailsVo(); - appInventoryCheckbillReportDetailsVo.setPdfUrl(docPdfComponent.getPrefixTemplateUrl() + data.getPdfUrl()); + if (StringUtils.isNotBlank(data.getPdfUrl())){ + appInventoryCheckbillReportDetailsVo.setPdfUrl(docPdfComponent.getPrefixTemplateUrl() + data.getPdfUrl()); + } + if (StringUtils.isNotBlank(data.getDetailUrl())){ + appInventoryCheckbillReportDetailsVo.setDetailUrl(docPdfComponent.getPrefixTemplateUrl() + data.getDetailUrl()); + } appInventoryCheckbillReportDetailsVo.setCreateByName(data.getCreateByName()); appInventoryCheckbillReportDetailsVo.setDeptName(data.getDeptName()); appInventoryCheckbillReportDetailsVo.setCreateTime(data.getCreateTime()); @@ -222,4 +228,53 @@ public class WmsInventoryCheckbillService { appInventoryCheckbillReportDetailsVo.setArea(area); return rb.success().setData(appInventoryCheckbillReportDetailsVo); } + + public ResultBean viewReportOld(String sid) { + ResultBean rb = ResultBean.fireFail(); + WmsInventoryCheckbillReportDetailsVo data = wmsInventoryCheckbillFeign.viewReport(sid).getData(); + AppInventoryCheckbillReportDetailsVo appInventoryCheckbillReportDetailsVo = new AppInventoryCheckbillReportDetailsVo(); + if (StringUtils.isNotBlank(data.getPdfUrl())){ + appInventoryCheckbillReportDetailsVo.setPdfUrl(docPdfComponent.getPrefixTemplateUrl() + data.getPdfUrl()); + } + if (StringUtils.isNotBlank(data.getDetailUrl())){ + appInventoryCheckbillReportDetailsVo.setDetailUrl(docPdfComponent.getPrefixTemplateUrl() + data.getDetailUrl()); + } + appInventoryCheckbillReportDetailsVo.setCreateByName(data.getCreateByName()); + appInventoryCheckbillReportDetailsVo.setDeptName(data.getDeptName()); + appInventoryCheckbillReportDetailsVo.setCreateTime(data.getCreateTime()); + appInventoryCheckbillReportDetailsVo.setSuperviseName(data.getFinances()); + appInventoryCheckbillReportDetailsVo.setRemarks(data.getRemarks()); + appInventoryCheckbillReportDetailsVo.setBookCountTotal(data.getYpNum()); + appInventoryCheckbillReportDetailsVo.setRealCountTotal(data.getSpNum()); + appInventoryCheckbillReportDetailsVo.setProfitCountTotal(data.getPyNum()); + appInventoryCheckbillReportDetailsVo.setLoseCountTotal(data.getPkNum()); + appInventoryCheckbillReportDetailsVo.setLossCountTotal(data.getPsNum()); + appInventoryCheckbillReportDetailsVo.setVirtualNum(data.getVirtualNum()); + appInventoryCheckbillReportDetailsVo.setUnInStorageNum(data.getUnInStorageNum()); + List ware = new ArrayList<>(); + for (WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo : data.getWarehouseStocktakList()) { + AppInventoryCheckbillReportSumVo appInventoryCheckbillReportSumVo = new AppInventoryCheckbillReportSumVo(); + appInventoryCheckbillReportSumVo.setWarehouseName(wmsInventoryCheckbillReportSumVo.getWarehouseName()); + appInventoryCheckbillReportSumVo.setBookCount(wmsInventoryCheckbillReportSumVo.getYpNum()); + appInventoryCheckbillReportSumVo.setRealCount(wmsInventoryCheckbillReportSumVo.getSpNum()); + appInventoryCheckbillReportSumVo.setProfitCount(wmsInventoryCheckbillReportSumVo.getPyNum()); + appInventoryCheckbillReportSumVo.setLoseCount(wmsInventoryCheckbillReportSumVo.getPkNum()); + appInventoryCheckbillReportSumVo.setLossCount(wmsInventoryCheckbillReportSumVo.getPsNum()); + ware.add(appInventoryCheckbillReportSumVo); + } + appInventoryCheckbillReportDetailsVo.setWare(ware); + List area = new ArrayList<>(); + for (WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo : data.getArehouseAreaeStocktakList()) { + AppInventoryCheckbillReportSumVo appInventoryCheckbillReportSumVo = new AppInventoryCheckbillReportSumVo(); + appInventoryCheckbillReportSumVo.setWarehouseName(wmsInventoryCheckbillReportSumVo.getWarehouseAreaeName()); + appInventoryCheckbillReportSumVo.setBookCount(wmsInventoryCheckbillReportSumVo.getYpNum()); + appInventoryCheckbillReportSumVo.setRealCount(wmsInventoryCheckbillReportSumVo.getSpNum()); + appInventoryCheckbillReportSumVo.setProfitCount(wmsInventoryCheckbillReportSumVo.getPyNum()); + appInventoryCheckbillReportSumVo.setLoseCount(wmsInventoryCheckbillReportSumVo.getPkNum()); + appInventoryCheckbillReportSumVo.setLossCount(wmsInventoryCheckbillReportSumVo.getPsNum()); + area.add(appInventoryCheckbillReportSumVo); + } + appInventoryCheckbillReportDetailsVo.setArea(area); + return rb.success().setData(appInventoryCheckbillReportDetailsVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java new file mode 100644 index 0000000000..13207244b0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailDetailsVo.java @@ -0,0 +1,71 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.smspricestrategybill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategyBillDetailVo.java
+ * Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo
+ * Description: 价格策略申请明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "价格策略申请明细 视图数据详情", description = "价格策略申请明细 视图数据详情") +public class SmsPricestrategyBillDetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请单sid") + private String mainSid; // 申请单sid + @ApiModelProperty("商品类别sid") + private String goodsTypeSid; // 商品类别sid + @ApiModelProperty("商品类别编码") + private String goodsTypeCode; + @ApiModelProperty("商品类别名称") + private String goodsTypeName; // 商品类别名称 + @ApiModelProperty("价格策略类别(固定比例1、价格区间2)") + private Integer strategyType; + @ApiModelProperty("加价比例") + private BigDecimal gdMarkupRate; + + @ApiModelProperty("价格策略区间") + private List smsPricestrategyBillGoodstypedetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailsVo.java new file mode 100644 index 0000000000..e0aee7f53c --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillDetailsVo.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.smspricestrategybill; + + +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; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategyBillVo.java
+ * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo
+ * Description: 价格策略申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "价格策略申请 视图数据详情", description = "价格策略申请 视图数据详情") +public class SmsPricestrategyBillDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("申请日期") + @JsonFormat( + pattern = "yyyy-MM-dd", + timezone = "GMT+8" + ) + private Date createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("制单人sid") + private String createBySid; + @ApiModelProperty("制单人姓名") + private String createByName; // 制单人姓名 + @ApiModelProperty("单据编号") + private String billNo; // 单据编号 + @ApiModelProperty("申请部门sid") + private String deptSid; + @ApiModelProperty("申请部门名称") + private String deptName; + @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 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("办结时间") + private Date finishTime; // 办结时间 + @ApiModelProperty("组织sid") + private String useOrgSid; // 组织sid + @ApiModelProperty("组织名称") + private String useOrgName; // 组织名称 + @ApiModelProperty("价格策略明细") + private List smsPricestrategyBillDetailList; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java new file mode 100644 index 0000000000..ede3a63928 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillFeign.java @@ -0,0 +1,55 @@ +package com.yxt.anrui.terminal.fegin.smspricestrategybill; + +import com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable.*; +import com.yxt.common.core.result.ResultBean; +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; + +@FeignClient( + contextId = "yxt-sms-SmsPricestrategyBill", + name = "yxt-sms", + path = "v1/smspricestrategybill" +) +public interface SmsPricestrategyBillFeign { + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody SmsPricestrategyBillCompleteDto query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean reject(@Valid @RequestBody SmsPricestrategyBillTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody SmsPricestrategyBillTaskQuery query); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + public ResultBean delegate(@RequestBody SmsPricestrategyBillDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody SmsPricestrategyBillDelegateQuery query); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java new file mode 100644 index 0000000000..a179e6e456 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/SmsPricestrategyBillGoodstypedetailDetailsVo.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.fegin.smspricestrategybill; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: yxt-sms(价格策略)
+ * File: SmsPricestrategyBillGoodstypedetailVo.java
+ * Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo
+ * Description: 价格策略商品类别明细 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-28 14:32:24
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "价格策略商品类别明细 视图数据详情", description = "价格策略商品类别明细 视图数据详情") +public class SmsPricestrategyBillGoodstypedetailDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("业务sid") + private String detailSid; // 业务sid + @ApiModelProperty("区间起始") + private BigDecimal rangeStart; // 区间起始 + @ApiModelProperty("区间截止") + private BigDecimal rangeEnd; // 区间截止 + @ApiModelProperty("加价比例") + private BigDecimal markupRate; // 加价比例 + +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillCompleteDto.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillCompleteDto.java new file mode 100644 index 0000000000..d34c593003 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillCompleteDto.java @@ -0,0 +1,37 @@ +package com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 14:57 + * @Description + */ +@Data +public class SmsPricestrategyBillCompleteDto implements Dto { + private static final long serialVersionUID = 6378752532534735663L; + + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id(PC)") + private String instanceId; + @ApiModelProperty(value = "流程id(移动)") + private String procInsId; + @ApiModelProperty(value = "意见") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + + private String orgPath; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillDelegateQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillDelegateQuery.java new file mode 100644 index 0000000000..ba1a829bd0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillDelegateQuery.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/9/28 9:28 + */ +@Data +public class SmsPricestrategyBillDelegateQuery { + @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; + + +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillNodeQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillNodeQuery.java new file mode 100644 index 0000000000..d3b3c00b6f --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:04 + * @Description + */ +@Data +public class SmsPricestrategyBillNodeQuery implements Query { + private static final long serialVersionUID = 9117613683840483366L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "业务sid") + private String businessSid; + @ApiModelProperty(value = "0 上一环节 1下一环节") + private Integer next; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillNodeVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillNodeVo.java new file mode 100644 index 0000000000..4520017edf --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillNodeVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:03 + * @Description + */ +@Data +public class SmsPricestrategyBillNodeVo implements Vo { + private static final long serialVersionUID = -833419512294877848L; + + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillTaskQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillTaskQuery.java new file mode 100644 index 0000000000..7d14e431ec --- /dev/null +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/smspricestrategybill/flowable/SmsPricestrategyBillTaskQuery.java @@ -0,0 +1,48 @@ +package com.yxt.anrui.terminal.fegin.smspricestrategybill.flowable; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/9/6 15:06 + * @Description + */ +@Data +public class SmsPricestrategyBillTaskQuery implements Query { + private static final long serialVersionUID = 1288615499873178778L; + + /** + * 终止、驳回、撤回 + */ + @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(PC)") + private String instanceId; + + @ApiModelProperty("流程实例Id(移动)") + private String procInsId; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportDetailsVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportDetailsVo.java index 2f84435d65..9563242e2f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportDetailsVo.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsinventorycheckbill/WmsInventoryCheckbillReportDetailsVo.java @@ -71,6 +71,8 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo { private String remarks; @ApiModelProperty("pdf路径") private String pdfUrl; + @ApiModelProperty("明细下载路径") + private String detailUrl; //总体盘点情况 @ApiModelProperty("应盘数量") @@ -93,6 +95,10 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo { private BigDecimal psNum; @ApiModelProperty("盘损金额") private BigDecimal psMoney; + @ApiModelProperty("虚拟件数量") + private BigDecimal virtualNum; + @ApiModelProperty("未入库数量") + private BigDecimal unInStorageNum; //仓库盘点情况 List warehouseStocktakList = new ArrayList<>(); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java index 9e7e0a4c7f..944cec4b16 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairPageVo.java @@ -14,6 +14,8 @@ import java.util.List; public class AsBusrepairPageVo { private String sid; + //维修工单sid + private String billSid; //维修工单编号 private String billNo; //工单创建日期 diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailOld.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailOld.java new file mode 100644 index 0000000000..a3f1dfcd79 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailOld.java @@ -0,0 +1,46 @@ +package com.yxt.anrui.as.api.asbusrepairinventorybilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class AsBusrepairInventorybillDetailOld { + + private String sid; + @ApiModelProperty("商品ID") + private String goodsID; + @ApiModelProperty("商品基础信息sid") + private String goodsSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码") + private String goodsSkuCode; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区Sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseAreaName; + @ApiModelProperty("库位Sid") + private String warehouseRackSid; + @ApiModelProperty("库位编号") + private String warehouseRackCode; + @ApiModelProperty("出/退库数量") + private BigDecimal count; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index d228828ad8..735ee245b9 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbill.app.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -59,4 +60,7 @@ public interface AsBusrepairBillMapper extends BaseMapper { List goodsConfrimInfoList(@Param("sid") String sid); IPage appRepairs(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + + @Update("update as_busrepair_bill set oldIsReclaim = '1' where billNo = #{billNo}") + ResultBean updateOldIsReclaim(String billNo); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 7f15de9ec1..080fdb7759 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -63,6 +63,7 @@ + + + + + UPDATE + as_busrepair_inventorybill_detail + SET + oldGoodsID = #{goodsID}, + oldGoodsSkuCode = #{goodsSkuCode}, + oldInventorySid = #{inSid}, + oldIsInInventory = 1 + WHERE sid = #{sid} + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java index c8d6f78999..1548aa11d3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail; import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybillDto; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; +import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailOld; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -23,9 +24,25 @@ public class AsBusrepairInventorybillDetailRest { @PostMapping("getDetailsByBillSid") @ApiOperation("根据工单sid查询商品明细") - ResultBean> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid,@RequestParam("busTypeKey") String busTypeKey) { + ResultBean> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid, @RequestParam("busTypeKey") String busTypeKey) { ResultBean rb = ResultBean.fireFail(); - List list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid,busTypeKey); + List list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid, busTypeKey); return rb.success().setData(list); } + + @PostMapping("getOldDetailsByBillSid") + @ApiOperation("根据工单sid查询商品明细-旧件") + ResultBean> getOldDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid) { + ResultBean rb = ResultBean.fireFail(); + List list = asBusrepairInventorybillDetailService.getOldDetailsByBillSid(busRepairBillSid); + return rb.success().setData(list); + } + + @PostMapping("updateOldBySid") + @ApiOperation("旧件入库修改") + ResultBean updateOldBySid(@RequestParam("sid") String sid, @RequestParam("goodsID") String goodsID, @RequestParam("goodsSkuCode") String goodsSkuCode, @RequestParam("inSid") String inSid) { + ResultBean rb = ResultBean.fireFail(); + asBusrepairInventorybillDetailService.updateOldBySid(sid, goodsID, goodsSkuCode, inSid); + return rb.success(); + } } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java index 7893ac4349..b8f2548f6e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailService.java @@ -4,12 +4,14 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.as.api.asbusrepairinventorybill.AsBusrepairInventorybill; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailDto; +import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailOld; import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo; import com.yxt.anrui.as.biz.asbusrepairinventorybill.AsBusrepairInventorybillService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestParam; import java.math.BigDecimal; import java.util.List; @@ -23,6 +25,7 @@ import java.util.List; public class AsBusrepairInventorybillDetailService extends MybatisBaseService { @Autowired private AsBusrepairInventorybillService asBusrepairInventorybillService; + public void saveOrUpdateDetail(List detailList, String sid) { baseMapper.deleteByMainSid(sid); detailList.forEach(v -> { @@ -38,8 +41,8 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService getDetailsByBillSid(String busRepairBillSid,String busTypeKey) { - return baseMapper.getDetailsByBillSid(busRepairBillSid,busTypeKey); + public List getDetailsByBillSid(String busRepairBillSid, String busTypeKey) { + return baseMapper.getDetailsByBillSid(busRepairBillSid, busTypeKey); } public List getGoodsDetailsByBillSid(String sid) { @@ -71,6 +74,14 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService getOldDetailsByBillSid(String busRepairBillSid) { + return baseMapper.getOldDetailsByBillSid(busRepairBillSid); + } + + public void updateOldBySid(String sid, String goodsID, String goodsSkuCode, String inSid) { + baseMapper.updateOldBySid(sid,goodsID,goodsSkuCode,inSid); } } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java index 57307c0d72..cbecec460f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOldInventoryRest.java @@ -44,9 +44,9 @@ public class WmsOldInventoryRest { return wmsOldInventoryService.getInit(sid); } - @ApiOperation("旧件入库保存") + @ApiOperation("旧件上架确认") @PostMapping("/saveInventory") - ResultBean saveInventory(@RequestBody WmsOldInventoryDto dto) { + ResultBean saveInventory(@RequestBody WmsOldGroundConfirm dto) { return wmsOldInventoryService.saveInventory(dto); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventorySaveDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventorySaveDto.java index 8d67062588..5c566d64f7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventorySaveDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventorySaveDto.java @@ -48,6 +48,10 @@ public class WmsInventorySaveDto { private String warehouseRackSid; @ApiModelProperty("库位编码") private String warehouseRackCode; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; @ApiModelProperty("首次入库日期") private String firstInDate; @ApiModelProperty("创建组织sid") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index dbc723d244..55db81c966 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -411,11 +411,14 @@ public class WmsInventoryCheckbillService extends MybatisBaseService total = wmsInventoryCheckbillDetailService.reportSum(sid, "total"); for (WmsInventoryCheckbillReportSumVo totalSum : total) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java index 795a543528..be925c0ddd 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReport.java @@ -54,5 +54,6 @@ public class WmsInventoryCheckbillReport extends BaseEntity { private String billSid; // 盘点单sid @ApiModelProperty("pdf路径") private String pdfUrl; // pdf路径 - + @ApiModelProperty("明细下载路径") + private String detailUrl; } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java index 47df76df45..80131f5d82 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDetailsVo.java @@ -72,6 +72,8 @@ public class WmsInventoryCheckbillReportDetailsVo implements Vo { private String remarks; @ApiModelProperty("pdf路径") private String pdfUrl; + @ApiModelProperty("明细下载路径") + private String detailUrl; @ApiModelProperty("仓库类型key") private String warehouseTypeKey; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java index b56894c290..de75236bb5 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbillreport/WmsInventoryCheckbillReportDto.java @@ -55,5 +55,6 @@ public class WmsInventoryCheckbillReportDto implements Dto { private String billSid; // 盘点单sid @ApiModelProperty("pdf路径") private String pdfUrl; // pdf路径 - + @ApiModelProperty("明细下载路径") + private String detailUrl; } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java new file mode 100644 index 0000000000..5c31fc4e8d --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsBusrepairInventorybillDetailOld.java @@ -0,0 +1,46 @@ +package com.yxt.wms.biz.inventory.wmsoldinventory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class WmsBusrepairInventorybillDetailOld { + + private String sid; + @ApiModelProperty("商品ID") + private String goodsID; + @ApiModelProperty("商品基础信息sid") + private String goodsSpuSid; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品编码") + private String goodsSkuCode; + @ApiModelProperty("厂家sid") + private String manufacturerSid; + @ApiModelProperty("厂家名称") + private String manufacturerName; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名称") + private String warehouseName; + @ApiModelProperty("库区Sid") + private String warehouseAreaSid; + @ApiModelProperty("库区名称") + private String warehouseAreaName; + @ApiModelProperty("库位Sid") + private String warehouseRackSid; + @ApiModelProperty("库位编号") + private String warehouseRackCode; + @ApiModelProperty("出/退库数量") + private BigDecimal count; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldGroundConfirm.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldGroundConfirm.java new file mode 100644 index 0000000000..1cdadbb724 --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldGroundConfirm.java @@ -0,0 +1,18 @@ +package com.yxt.wms.biz.inventory.wmsoldinventory; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +@Data +public class WmsOldGroundConfirm { + + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("组织全路径") + private String orgPath; + + private List oldList; +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java index 0069a44225..6231499c85 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java @@ -1,6 +1,7 @@ package com.yxt.wms.biz.inventory.wmsoldinventory; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.config.component.FileUploadComponent; @@ -11,6 +12,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory; +import com.yxt.wms.biz.inventory.wmsinventory.WmsInventorySaveDto; import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService; import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatch; import com.yxt.wms.biz.inventory.wmsinventorybatch.WmsInventoryBatchService; @@ -18,6 +20,12 @@ import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecord; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign; +import com.yxt.wms.feign.as.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; +import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuser.SysUserVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -38,13 +46,17 @@ public class WmsOldInventoryService extends MybatisBaseService listPage(PagerQuery pagerQuery) { WmsOldInventoryQuery query = pagerQuery.getParams(); @@ -93,52 +105,71 @@ public class WmsOldInventoryService extends MybatisBaseService split = Arrays.asList(wmsOldGroundConfirm.getOrgPath().split("/")); + if (split.size() > 1) { + //获取本级sid获取本级部门信息 + SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); + useOrgSid = sysOrganization1.getSid(); + } else { + SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); + useOrgSid = sysOrganization.getSid(); + } + List dtos = wmsOldGroundConfirm.getOldList(); + for (WmsBusrepairInventorybillDetailOld wmsBusrepairInventorybillDetailOld : dtos) { + WmsInventorySaveDto dto = new WmsInventorySaveDto(); + dto.setCreateBySid(wmsOldGroundConfirm.getCreateBySid()); + dto.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID()); + dto.setGoodsSpuSid(wmsBusrepairInventorybillDetailOld.getGoodsSpuSid()); + dto.setGoodsSpuName(wmsBusrepairInventorybillDetailOld.getGoodsSpuName()); + dto.setGoodsSkuSid(wmsBusrepairInventorybillDetailOld.getGoodsSkuSid()); + dto.setGoodsSkuTitle(wmsBusrepairInventorybillDetailOld.getGoodsSkuTitle()); + dto.setGoodsSkuCode(wmsBusrepairInventorybillDetailOld.getGoodsSkuCode()); + dto.setGoodsSkuOwnSpec(wmsBusrepairInventorybillDetailOld.getGoodsSkuOwnSpec()); + dto.setManufacturerSid(wmsBusrepairInventorybillDetailOld.getManufacturerSid()); + dto.setManufacturerName(wmsBusrepairInventorybillDetailOld.getManufacturerName()); + dto.setUnit(wmsBusrepairInventorybillDetailOld.getUnit()); + dto.setCount(wmsBusrepairInventorybillDetailOld.getCount().toString()); + dto.setWarehouseSid(wmsBusrepairInventorybillDetailOld.getWarehouseSid()); + dto.setWarehouseName(wmsBusrepairInventorybillDetailOld.getWarehouseName()); + dto.setWarehouseRackSid(wmsBusrepairInventorybillDetailOld.getWarehouseRackSid()); + dto.setWarehouseRackCode(wmsBusrepairInventorybillDetailOld.getWarehouseRackCode()); + dto.setFirstInDate(DateUtil.today()); + dto.setCreateOrgSid(createOrgSid); + dto.setUseOrgSid(useOrgSid); + String inSid = wmsInventoryService.saveWmsInventory(dto).getData(); + //生成出入库记录 + WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord(); + wmsInventoryRecord.setCreateBySid(wmsOldGroundConfirm.getCreateBySid()); + wmsInventoryRecord.setInventorySid(inSid); + wmsInventoryRecord.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID()); + wmsInventoryRecord.setBillType("1"); + wmsInventoryRecord.setBusTypeKey("09"); + wmsInventoryRecord.setBusTypeValue("其他入库"); + wmsInventoryRecord.setBillObjName(wmsBusrepairInventorybillDetailOld.getManufacturerName()); + wmsInventoryRecord.setGoodsSpuSid(wmsBusrepairInventorybillDetailOld.getGoodsSpuSid()); + wmsInventoryRecord.setGoodsSpuName(wmsBusrepairInventorybillDetailOld.getGoodsSpuName()); + wmsInventoryRecord.setGoodsSkuSid(wmsBusrepairInventorybillDetailOld.getGoodsSkuSid()); + wmsInventoryRecord.setGoodsSkuTitle(wmsBusrepairInventorybillDetailOld.getGoodsSkuTitle()); + wmsInventoryRecord.setGoodsSkuCode(wmsBusrepairInventorybillDetailOld.getGoodsSkuCode()); + wmsInventoryRecord.setGoodsSkuOwnSpec(wmsBusrepairInventorybillDetailOld.getGoodsSkuOwnSpec()); + wmsInventoryRecord.setCurrentCount(wmsBusrepairInventorybillDetailOld.getCount()); + wmsInventoryRecord.setUnit(wmsBusrepairInventorybillDetailOld.getUnit()); + wmsInventoryRecord.setCount(wmsBusrepairInventorybillDetailOld.getCount()); + wmsInventoryRecord.setWarehouseSid(wmsBusrepairInventorybillDetailOld.getWarehouseSid()); + wmsInventoryRecord.setWarehouseName(wmsBusrepairInventorybillDetailOld.getWarehouseName()); + wmsInventoryRecord.setWarehouseRackSid(wmsBusrepairInventorybillDetailOld.getWarehouseRackSid()); + wmsInventoryRecord.setWarehouseRackCode(wmsBusrepairInventorybillDetailOld.getWarehouseRackCode()); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(wmsOldGroundConfirm.getCreateBySid()).getData(); + wmsInventoryRecord.setHandlerSid(wmsOldGroundConfirm.getCreateBySid()); + wmsInventoryRecord.setHandlerName(sysUserVo.getName()); + wmsInventoryRecordService.save(wmsInventoryRecord); + //修改维修单中对应商品旧件状态 + asBusrepairInventorybillDetailFeign.updateOldBySid(wmsBusrepairInventorybillDetailOld.getSid(),wmsBusrepairInventorybillDetailOld.getGoodsID(),wmsBusrepairInventorybillDetailOld.getGoodsSkuCode(),inSid); + } return rb.success(); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java index 3adb3a865b..09efcd6670 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldregister/WmsOldRegisterService.java @@ -6,6 +6,7 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBillFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; @@ -21,6 +22,8 @@ import java.util.List; public class WmsOldRegisterService extends MybatisBaseService { @Autowired private FileUploadComponent fileUploadComponent; + @Autowired + private AsBusrepairBillFeign asBusrepairBillFeign; public ResultBean saveorUpdateOldRegister(WmsOldRegisterDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -39,6 +42,7 @@ public class WmsOldRegisterService extends MybatisBaseService selectOneByBillNo(@PathVariable("billNo") String billNo); + + @PostMapping("/updateOldIsReclaim") + @ApiOperation("修改维修工单是否登记") + ResultBean updateOldIsReclaim(@RequestParam("billNo") String billNo); } diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java new file mode 100644 index 0000000000..32e38a6cdf --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailFeign.java @@ -0,0 +1,26 @@ +package com.yxt.wms.feign.as.asbusrepairinventorybilldetail; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.feign.as.asbusrepairbill.AsBusrepairBill; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/3/20 + **/ +@FeignClient( + contextId = "yxt-as-AsBusrepairInventorybillDetail", + name = "yxt-as", + path = "v1/AsBusrepairInventorybillDetail") +public interface AsBusrepairInventorybillDetailFeign { + + @PostMapping("updateOldBySid") + @ApiOperation("旧件入库修改") + ResultBean updateOldBySid(@RequestParam("sid") String sid,@RequestParam("goodsID") String goodsID,@RequestParam("goodsSkuCode") String goodsSkuCode,@RequestParam("inSid") String inSid); +}