1

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<SysFlowccMapper, SysFlo
     public PagerVo<SysFlowccVo> listPageVo(PagerQuery<SysFlowccQuery> pq) {
         SysFlowccQuery query = pq.getParams();
         QueryWrapper<SysFlowcc> qw = new QueryWrapper<>();
-      /*  if (StringUtils.isNotBlank(query.getFlowName())) {
+        if (StringUtils.isNotBlank(query.getFlowName())) {
             qw.like("flowName", query.getFlowName());
-        }*/
+        }
         IPage<SysFlowcc> page = PagerUtil.queryToPage(pq);
         IPage<SysFlowccVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<SysFlowccVo> p = PagerUtil.pageToVo(pagging, null);

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<AppPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailList;
+}

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(价格策略) <br/>
+ * File: SmsPricestrategyBillVo.java <br/>
+ * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo <br/>
+ * Description: 价格策略申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-28 14:32:24 <br/>
+ *
+ * @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<AppPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailList;
+}

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<AppPricestrategyBillDetailsVo> 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<String> 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);
+}

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(价格策略) <br/>
+ * File: SmsPricestrategyBillGoodstypedetailVo.java <br/>
+ * Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo <br/>
+ * Description: 价格策略商品类别明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-28 14:32:24 <br/>
+ *
+ * @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; // 加价比例
+
+}

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;
+}

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;
+}

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;
+}

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;
+}

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<AppInventoryCheckbillReportSumVo> ware = new ArrayList<>();

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) {

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<AppPricestrategyBillDetailsVo> 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<String> 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);
+    }
+}

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<AppPricestrategyBillDetailsVo> 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<AppPricestrategyBillGoodstypedetailDetailsVo> 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<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();
+        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<String> getFlowOperateTitle(PricestrategyBillQuery query) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = query.getNext();
+        SmsPricestrategyBillNodeQuery getNodeQuery = new SmsPricestrategyBillNodeQuery();
+        BeanUtil.copyProperties(query, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<SmsPricestrategyBillNodeVo>> 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<List<SmsPricestrategyBillNodeVo>> 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();
+    }
+}

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<AppInventoryCheckbillReportDetailsVo> viewReport(String sid) {
         return wmsInventoryCheckbillService.viewReport(sid);
     }
+
+    @Override
+    public ResultBean<AppInventoryCheckbillReportDetailsVo> viewReportOld(String sid) {
+        return wmsInventoryCheckbillService.viewReportOld(sid);
+    }
 }

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<AppInventoryCheckbillReportDetailsVo> 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<AppInventoryCheckbillReportSumVo> 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<AppInventoryCheckbillReportSumVo> 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);
+    }
 }

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(价格策略) <br/>
+ * File: SmsPricestrategyBillDetailVo.java <br/>
+ * Class: com.yxt.sms.api.smspricestrategybilldetail.SmsPricestrategyBillDetailVo <br/>
+ * Description: 价格策略申请明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-28 14:32:24 <br/>
+ *
+ * @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<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailList;
+}

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(价格策略) <br/>
+ * File: SmsPricestrategyBillVo.java <br/>
+ * Class: com.yxt.sms.api.smspricestrategybill.SmsPricestrategyBillVo <br/>
+ * Description: 价格策略申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-28 14:32:24 <br/>
+ *
+ * @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<SmsPricestrategyBillDetailDetailsVo> smsPricestrategyBillDetailList;
+}

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<SmsPricestrategyBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody SmsPricestrategyBillCompleteDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    public ResultBean<List<SmsPricestrategyBillNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap SmsPricestrategyBillNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    public ResultBean<List<SmsPricestrategyBillNodeVo>> 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);
+}

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(价格策略) <br/>
+ * File: SmsPricestrategyBillGoodstypedetailVo.java <br/>
+ * Class: com.yxt.sms.api.smspricestrategybillgoodstypedetail.SmsPricestrategyBillGoodstypedetailVo <br/>
+ * Description: 价格策略商品类别明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-28 14:32:24 <br/>
+ *
+ * @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; // 加价比例
+
+}

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;
+}

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;
+
+
+}

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;
+}

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<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

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;
+}

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<WmsInventoryCheckbillReportSumVo> warehouseStocktakList = new ArrayList<>();

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;
     //工单创建日期

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;
+}

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<AsBusrepairBill> {
     List<GoodsConfrimDetailsVo> goodsConfrimInfoList(@Param("sid") String sid);
 
     IPage<AppBusrepairBillVo> appRepairs(IPage<AsBusrepairBill> page, @Param(Constants.WRAPPER)QueryWrapper<AsBusrepairBill> qw);
+
+    @Update("update as_busrepair_bill set oldIsReclaim = '1' where billNo = #{billNo}")
+    ResultBean updateOldIsReclaim(String billNo);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -63,6 +63,7 @@
     <select id="pageBillList" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">
         SELECT
         wor.sid,
+        a.sid AS billSid,
         a.nodeName AS taskName,
         wor.billNo,
         DATE_FORMAT(a.createTime, '%Y-%m-%d') AS billTime,
@@ -75,11 +76,25 @@
         yxt_wms.wms_old_register wor
         LEFT JOIN as_busrepair_bill a
         ON a.billNo = wor.billNo
+        LEFT JOIN as_busrepair_inventorybill ai
+        ON ai.sourceBillSid = a.sid
+        LEFT JOIN as_busrepair_inventorybill_detail ad
+        ON ai.sid = ad.billSid
         LEFT JOIN anrui_portal.sys_organization AS s
         ON a.deptSid = s.sid
         <where>
             ${ew.sqlSegment}
         </where>
+        AND (SELECT
+        COUNT(*)
+        FROM
+        as_busrepair_inventorybill_detail ad
+        WHERE (
+        ad.oldInventorySid IS NULL
+        OR ad.oldInventorySid = ''
+        )
+        AND ad.`billSid` = ai.sid) > 0
+        GROUP BY a.sid
     </select>
 
     <select id="selectByBillNo" resultType="com.yxt.anrui.as.api.asbusrepairbill.AsBusrepairPageVo">

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java

@@ -87,6 +87,12 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.saveBill(dto);
     }
 
+    @PostMapping("/updateOldIsReclaim")
+    @ApiOperation("修改维修工单是否登记")
+    ResultBean updateOldIsReclaim(@RequestParam("billNo") String billNo) {
+        return asBusrepairBillService.updateOldIsReclaim(billNo);
+    }
+
     @PostMapping("/submitNextNode")
     @ApiOperation("提交至下一环节")
     ResultBean<String> submitNextNode(@RequestBody AsBusrepairBillDto dto) {

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java

@@ -1297,7 +1297,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         qw.apply(StringUtils.isNotBlank(query.getCreateTimeStart()), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + query.getCreateTimeStart() + "','%Y-%m-%d')").
                 apply(StringUtils.isNotBlank(query.getCreateTimeEnd()), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + query.getCreateTimeEnd() + "','%Y-%m-%d')"
                 );
-        qw.eq("a.nodeCode", 3);
+        qw.and(wrapper -> wrapper.eq("a.nodeCode", 3).or().eq("a.nodeCode", 5));
         IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AsBusrepairPageVo> pagging = baseMapper.pageBillList(page, qw);
         for (AsBusrepairPageVo record : pagging.getRecords()) {
@@ -2392,4 +2392,8 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
         PagerVo<AppBusrepairBillVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public ResultBean updateOldIsReclaim(String billNo) {
+        return baseMapper.updateOldIsReclaim(billNo);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.java

@@ -2,6 +2,7 @@ package com.yxt.anrui.as.biz.asbusrepairinventorybilldetail;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetail;
+import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailOld;
 import com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,4 +27,8 @@ public interface AsBusrepairInventorybillDetailMapper extends BaseMapper<AsBusre
     List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSidForBack(@Param("sid") String sid);
 
     AsOldpartreturnDetailsVo selByGdSidAndOldCode(@Param("repairBillSid") String repairBillSid,@Param("goodsSkuCode") String goodsSkuCode);
+
+    List<AsBusrepairInventorybillDetailOld> getOldDetailsByBillSid(String busRepairBillSid);
+
+    void updateOldBySid(@Param("sid") String sid,@Param("goodsID") String goodsID,@Param("goodsSkuCode") String goodsSkuCode,@Param("inSid") String inSid);
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml

@@ -63,4 +63,48 @@
           AND ad.oldGoodsSkuCode = #{goodsSkuCode}
                 LIMIT 1
     </select>
+
+    <select id="getOldDetailsByBillSid"
+            resultType="com.yxt.anrui.as.api.asbusrepairinventorybilldetail.AsBusrepairInventorybillDetailOld">
+        SELECT
+                d.sid,
+                CONCAT(d.goodsID,'-O') AS goodsID,
+                d.goodsSpuSid,
+                d.goodsSpuName,
+                d.goodsSkuSid,
+                d.goodsSkuTitle,
+                d.goodsSkuCode,
+                d.manufacturerSid,
+                d.manufacturerName,
+                d.goodsSkuOwnSpec,
+                d.unit,
+                d.warehouseSid,
+                d.warehouseName,
+                wa.sid AS warehouseAreaSid,
+                wa.areaName AS warehouseAreaName,
+                d.warehouseRackSid,
+                d.warehouseRackCode,
+                d.count
+        FROM
+                as_busrepair_inventorybill_detail AS d
+                        LEFT JOIN as_busrepair_inventorybill AS b
+                        ON b.sid = d.billSid
+                        LEFT JOIN yxt_wms.wms_warehouse_rack wr
+                        ON d.warehouseRackSid = wr.`sid`
+                        LEFT JOIN yxt_wms.wms_warehouse_area wa
+                        ON wr.locationSid = wa.sid
+        WHERE b.sourceBillSid = #{busRepairBillSid}
+        AND (d.oldInventorySid IS NULL OR d.oldInventorySid = '')
+    </select>
+
+    <update id="updateOldBySid">
+        UPDATE
+                as_busrepair_inventorybill_detail
+        SET
+                oldGoodsID = #{goodsID},
+                oldGoodsSkuCode = #{goodsSkuCode},
+                oldInventorySid = #{inSid},
+                oldIsInInventory = 1
+        WHERE sid = #{sid}
+    </update>
 </mapper>

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<List<AsBusrepairInventorybillDetail>> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid,@RequestParam("busTypeKey") String busTypeKey) {
+    ResultBean<List<AsBusrepairInventorybillDetail>> getDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid, @RequestParam("busTypeKey") String busTypeKey) {
         ResultBean rb = ResultBean.fireFail();
-        List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid,busTypeKey);
+        List<AsBusrepairInventorybillDetail> list = asBusrepairInventorybillDetailService.getDetailsByBillSid(busRepairBillSid, busTypeKey);
         return rb.success().setData(list);
     }
+
+    @PostMapping("getOldDetailsByBillSid")
+    @ApiOperation("根据工单sid查询商品明细-旧件")
+    ResultBean<List<AsBusrepairInventorybillDetailOld>> getOldDetailsByBillSid(@RequestParam("busRepairBillSid") String busRepairBillSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AsBusrepairInventorybillDetailOld> 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();
+    }
 }

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<AsBusrepairInventorybillDetailMapper, AsBusrepairInventorybillDetail> {
     @Autowired
     private AsBusrepairInventorybillService asBusrepairInventorybillService;
+
     public void saveOrUpdateDetail(List<AsBusrepairInventorybillDetailDto> detailList, String sid) {
         baseMapper.deleteByMainSid(sid);
         detailList.forEach(v -> {
@@ -38,8 +41,8 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService<As
     }
 
 
-    public List<AsBusrepairInventorybillDetail> getDetailsByBillSid(String busRepairBillSid,String busTypeKey) {
+    public List<AsBusrepairInventorybillDetail> getDetailsByBillSid(String busRepairBillSid, String busTypeKey) {
-        return baseMapper.getDetailsByBillSid(busRepairBillSid,busTypeKey);
+        return baseMapper.getDetailsByBillSid(busRepairBillSid, busTypeKey);
     }
 
     public List<AsBusrepairInventorybillDetail> getGoodsDetailsByBillSid(String sid) {
@@ -71,6 +74,14 @@ public class AsBusrepairInventorybillDetailService extends MybatisBaseService<As
     }
 
     public AsOldpartreturnDetailsVo selByGdSidAndOldCode(String repairBillSid, String goodsSkuCode) {
-        return baseMapper.selByGdSidAndOldCode(repairBillSid,goodsSkuCode);
+        return baseMapper.selByGdSidAndOldCode(repairBillSid, goodsSkuCode);
+    }
+
+    public List<AsBusrepairInventorybillDetailOld> getOldDetailsByBillSid(String busRepairBillSid) {
+        return baseMapper.getOldDetailsByBillSid(busRepairBillSid);
+    }
+
+    public void updateOldBySid(String sid, String goodsID, String goodsSkuCode, String inSid) {
+        baseMapper.updateOldBySid(sid,goodsID,goodsSkuCode,inSid);
     }
 }

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

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")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java

@@ -411,11 +411,14 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         wmsInventoryCheckbillReportDetailsVo.setDeptName(wmsInventoryCheckbill.getDeptName());
         wmsInventoryCheckbillReportDetailsVo.setCreateTime(wmsInventoryCheckbill.getCreateTime());
         wmsInventoryCheckbillReportDetailsVo.setFinances(wmsInventoryCheckbill.getSuperviseName());
+        wmsInventoryCheckbillReportDetailsVo.setVirtualNum(wmsInventoryCheckbill.getVrCount());
+        wmsInventoryCheckbillReportDetailsVo.setUnInStorageNum(wmsInventoryCheckbill.getNotInCount());
         //盘点报告备注
         WmsInventoryCheckbillReport wmsInventoryCheckbillReport = wmsInventoryCheckbillReportService.selByBillSid(sid);
         wmsInventoryCheckbillReportDetailsVo.setRemarks(wmsInventoryCheckbillReport.getRemarks());
         //盘点报告PDF路径
         wmsInventoryCheckbillReportDetailsVo.setPdfUrl(wmsInventoryCheckbillReport.getPdfUrl());
+        wmsInventoryCheckbillReportDetailsVo.setDetailUrl(wmsInventoryCheckbillReport.getDetailUrl());
         //总体盘点情况
         List<WmsInventoryCheckbillReportSumVo> total = wmsInventoryCheckbillDetailService.reportSum(sid, "total");
         for (WmsInventoryCheckbillReportSumVo totalSum : total) {

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;
 }

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;
 

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;
 }

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;
+}

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<WmsBusrepairInventorybillDetailOld> oldList;
+}

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<WmsOldInventoryMa
     @Autowired
     private WmsInventoryService wmsInventoryService;
     @Autowired
-    private WmsInventoryBatchService wmsInventoryBatchService;
-    @Autowired
     private WmsInventoryRecordService wmsInventoryRecordService;
     @Autowired
-    private AsBusrepairBillFeign asBusrepairBillFeign;
-    @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+    @Autowired
+    private SysUserFeign sysUserFeign;
+    @Autowired
+    private AsBusrepairInventorybillDetailFeign asBusrepairInventorybillDetailFeign;
 
     public PagerVo<WmsOldInventoryVo> listPage(PagerQuery<WmsOldInventoryQuery> pagerQuery) {
         WmsOldInventoryQuery query = pagerQuery.getParams();
@@ -93,52 +105,71 @@ public class WmsOldInventoryService extends MybatisBaseService<WmsOldInventoryMa
         return rb.success().setData(wmsOldInventoryInitVo);
     }
 
-    public ResultBean saveInventory(WmsOldInventoryDto dto) {
+    public ResultBean saveInventory(WmsOldGroundConfirm wmsOldGroundConfirm) {
         ResultBean rb = ResultBean.fireFail();
-        String sid = dto.getSid();
+        String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(wmsOldGroundConfirm.getOrgPath()).getData();
-        WmsOldInventory wmsOldInventory = fetchBySid(sid);
+        String useOrgSid = "";
-        WmsInventory wmsInventory = new WmsInventory();
+        List<String> split = Arrays.asList(wmsOldGroundConfirm.getOrgPath().split("/"));
-        BeanUtil.copyProperties(dto, wmsInventory, "sid");
+        if (split.size() > 1) {
-        wmsInventory.setGoodsID(dto.getGoodsSkuCode());
+            //获取本级sid获取本级部门信息
-        wmsInventory.setGoodsSpuName(dto.getGoodsSkuTitle());
+            SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
-        wmsInventoryService.insert(wmsInventory);
+            useOrgSid = sysOrganization1.getSid();
-        WmsInventoryBatch wmsInventoryBatch = new WmsInventoryBatch();
+        } else {
-        wmsInventoryBatch.setInventorySid(wmsInventory.getSid());
+            SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
-        wmsInventoryBatch.setBillNo(dto.getSourceBillNo());
+            useOrgSid = sysOrganization.getSid();
-        AsBusrepairBill asBusrepairBill = asBusrepairBillFeign.selectOneByBillNo(dto.getSourceBillNo()).getData();
+        }
-        wmsInventoryBatch.setBillSid(asBusrepairBill.getSid());
+        List<WmsBusrepairInventorybillDetailOld> dtos = wmsOldGroundConfirm.getOldList();
-        wmsInventoryBatch.setSupplierName(dto.getManufacturerName());
+        for (WmsBusrepairInventorybillDetailOld wmsBusrepairInventorybillDetailOld : dtos) {
-        wmsInventoryBatchService.save(wmsInventoryBatch);
+            WmsInventorySaveDto dto = new WmsInventorySaveDto();
-        //生成出入库记录
+            dto.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
-        WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord();
+            dto.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID());
-        wmsInventoryRecord.setInventorySid(wmsInventory.getSid());
+            dto.setGoodsSpuSid(wmsBusrepairInventorybillDetailOld.getGoodsSpuSid());
-        wmsInventoryRecord.setGoodsID(dto.getGoodsSkuCode());
+            dto.setGoodsSpuName(wmsBusrepairInventorybillDetailOld.getGoodsSpuName());
-        wmsInventoryRecord.setSourceBillSid(sid);
+            dto.setGoodsSkuSid(wmsBusrepairInventorybillDetailOld.getGoodsSkuSid());
-        wmsInventoryRecord.setBillNo("");
+            dto.setGoodsSkuTitle(wmsBusrepairInventorybillDetailOld.getGoodsSkuTitle());
-        wmsInventoryRecord.setBillType("1");
+            dto.setGoodsSkuCode(wmsBusrepairInventorybillDetailOld.getGoodsSkuCode());
-        wmsInventoryRecord.setBusTypeKey("09");
+            dto.setGoodsSkuOwnSpec(wmsBusrepairInventorybillDetailOld.getGoodsSkuOwnSpec());
-        wmsInventoryRecord.setBusTypeValue("其他入库");
+            dto.setManufacturerSid(wmsBusrepairInventorybillDetailOld.getManufacturerSid());
-        wmsInventoryRecord.setBillObjSid("");
+            dto.setManufacturerName(wmsBusrepairInventorybillDetailOld.getManufacturerName());
-        wmsInventoryRecord.setBillObjName(dto.getManufacturerName());
+            dto.setUnit(wmsBusrepairInventorybillDetailOld.getUnit());
-        wmsInventoryRecord.setGoodsSpuName(dto.getGoodsSkuTitle());
+            dto.setCount(wmsBusrepairInventorybillDetailOld.getCount().toString());
-        wmsInventoryRecord.setGoodsSkuTitle(dto.getGoodsSkuTitle());
+            dto.setWarehouseSid(wmsBusrepairInventorybillDetailOld.getWarehouseSid());
-        wmsInventoryRecord.setGoodsSkuCode(dto.getGoodsSkuCode());
+            dto.setWarehouseName(wmsBusrepairInventorybillDetailOld.getWarehouseName());
-        wmsInventoryRecord.setGoodsSkuOwnSpec(dto.getGoodsSkuOwnSpec());
+            dto.setWarehouseRackSid(wmsBusrepairInventorybillDetailOld.getWarehouseRackSid());
-        wmsInventoryRecord.setCurrentCount(new BigDecimal(dto.getCount()));
+            dto.setWarehouseRackCode(wmsBusrepairInventorybillDetailOld.getWarehouseRackCode());
-        wmsInventoryRecord.setUnit(dto.getUnit());
+            dto.setFirstInDate(DateUtil.today());
-        wmsInventoryRecord.setCount(new BigDecimal(dto.getCount()));
+            dto.setCreateOrgSid(createOrgSid);
-        wmsInventoryRecord.setWarehouseSid(dto.getWarehouseSid());
+            dto.setUseOrgSid(useOrgSid);
-        wmsInventoryRecord.setWarehouseName(dto.getWarehouseName());
+            String inSid = wmsInventoryService.saveWmsInventory(dto).getData();
-        wmsInventoryRecord.setWarehouseRackSid(dto.getWarehouseRackSid());
+            //生成出入库记录
-        wmsInventoryRecord.setWarehouseRackCode(dto.getWarehouseRackCode());
+            WmsInventoryRecord wmsInventoryRecord = new WmsInventoryRecord();
-        wmsInventoryRecordService.save(wmsInventoryRecord);
+            wmsInventoryRecord.setCreateBySid(wmsOldGroundConfirm.getCreateBySid());
-        //修改待入库旧件的已入库数量
+            wmsInventoryRecord.setInventorySid(inSid);
-        wmsOldInventory.setInCount(new BigDecimal(wmsOldInventory.getInCount()).add(new BigDecimal(dto.getCount())).toString());
+            wmsInventoryRecord.setGoodsID(wmsBusrepairInventorybillDetailOld.getGoodsID());
-        if (wmsOldInventory.getCount().equals(wmsOldInventory.getInCount())){
+            wmsInventoryRecord.setBillType("1");
-            //数量与已入库数量相等，修改待入库旧件为已入库
+            wmsInventoryRecord.setBusTypeKey("09");
-            wmsOldInventory.setState(0);
+            wmsInventoryRecord.setBusTypeValue("其他入库");
-        }
+            wmsInventoryRecord.setBillObjName(wmsBusrepairInventorybillDetailOld.getManufacturerName());
-        baseMapper.updateById(wmsOldInventory);
+            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();
     }
 

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<WmsOldRegisterMapper, WmsOldRegister> {
     @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<WmsOldRegisterMapp
             wmsOldRegister.setPhotos(photoss);
             baseMapper.updateById(wmsOldRegister);
         }
+        asBusrepairBillFeign.updateOldIsReclaim(wmsOldRegister.getBillNo());
         return rb.success();
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/feign/as/asbusrepairbill/AsBusrepairBillFeign.java

@@ -6,6 +6,7 @@ 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;
 
 /**
@@ -22,4 +23,8 @@ public interface AsBusrepairBillFeign {
     @ApiOperation("根据维修工单号查询")
     @GetMapping("/selectOneByBillNo/{billNo}")
     public ResultBean<AsBusrepairBill> selectOneByBillNo(@PathVariable("billNo") String billNo);
+
+    @PostMapping("/updateOldIsReclaim")
+    @ApiOperation("修改维修工单是否登记")
+    ResultBean updateOldIsReclaim(@RequestParam("billNo") String billNo);
 }

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);
+}