Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -2232,7 +2232,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         filesList.add(xsddspFile);
         //生成金融报价单
         if ("002".equals(baseVehicleOut1.getTypeKey()) && "001".equals(baseVehicleOut1.getMaterialTypeKey())) {
-            String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSid(baseVehicleOut1.getVinSid()).getData();
+            String ckSid = busDeliveredApplyDetailsFeign.fetchByVehSidAndContractNo(baseVehicleOut1.getVinSid(),baseVehicleOutApply.getContractNo()).getData();
             if (StringUtils.isNotBlank(ckSid)) {
                 String jrbjdUrl = createjrbjdPdfHB(ckSid, baseVehicleOut1.getVinSid());
                 if (!"1".equals(jrbjdUrl)) {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeign.java

@@ -87,7 +87,7 @@ public interface BusDeliveredApplyDetailsFeign {
     ResultBean<List<BusDeliveredApplyDetails>> selectByApplySid(@RequestParam("sid") String sid);
 
     @ApiOperation("查询出库申请单sid")
-    @PostMapping("/fetchByVehSid")
+    @PostMapping("/fetchByVehSidAndContractNo")
     @ResponseBody
-    ResultBean<String> fetchByVehSid(@RequestParam("vinSid") String vinSid);
+    ResultBean<String> fetchByVehSidAndContractNo(@RequestParam("vinSid") String vinSid,@RequestParam("contractNo") String contractNo);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsFeignFallback.java

@@ -76,7 +76,7 @@ public class BusDeliveredApplyDetailsFeignFallback implements BusDeliveredApplyD
     }
 
     @Override
-    public ResultBean<String> fetchByVehSid(String vinSid) {
+    public ResultBean<String> fetchByVehSidAndContractNo(String vinSid, String contractNo) {
         return null;
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.java

@@ -96,7 +96,7 @@ public interface BusDeliveredApplyDetailsMapper extends BaseMapper<BusDeliveredA
 
     List<String> selectVinSidByApplySid(String sid);
 
-    String fetchByVehSid(String vinSid);
+    String fetchByVehSidAndContractNo(@Param("vinSid") String vinSid,@Param("contractNo") String contractNo);
 
     int fetchByIsDeleteVinSid(String vinSid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsMapper.xml

@@ -77,12 +77,13 @@
           and bo.contractNo = ba.contractNo
     </select>
 
-    <select id="fetchByVehSid" resultType="java.lang.String">
+    <select id="fetchByVehSidAndContractNo" resultType="java.lang.String">
         SELECT ba.sid
         FROM bus_delivered_apply ba
                      JOIN bus_delivered_apply_details bd
                 ON ba.sid = bd.applySid
         WHERE bd.vinSid = #{vinSid}
+          AND ba.contractNo = #{contractNo}
           AND ba.nodeState = '已办结'
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsRest.java

@@ -99,7 +99,7 @@ public class BusDeliveredApplyDetailsRest implements BusDeliveredApplyDetailsFei
     }
 
     @Override
-    public ResultBean<String> fetchByVehSid(String vinSid) {
-        return busDeliveredApplyDetailsService.fetchByVehSid(vinSid);
+    public ResultBean<String> fetchByVehSidAndContractNo(String vinSid,String contractNo) {
+        return busDeliveredApplyDetailsService.fetchByVehSidAndContractNo(vinSid,contractNo);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapplydetails/BusDeliveredApplyDetailsService.java

@@ -217,9 +217,9 @@ public class BusDeliveredApplyDetailsService extends MybatisBaseService<BusDeliv
         return baseMapper.selectVinSidByApplySid(sid);
     }
 
-    public ResultBean<String> fetchByVehSid(String vinSid) {
+    public ResultBean<String> fetchByVehSidAndContractNo(String vinSid,String contractNo) {
         ResultBean rb = ResultBean.fireFail();
-        String ckSid = baseMapper.fetchByVehSid(vinSid);
+        String ckSid = baseMapper.fetchByVehSidAndContractNo(vinSid,contractNo);
         return rb.success().setData(ckSid);
     }
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/HandleBean.java

@@ -0,0 +1,44 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HandleBean {
+
+    /**
+     * 损坏数量，默认 0
+     */
+    private String badNum;
+    private List<String> files;
+    /**
+     * 商品ID
+     */
+    private String goodsID;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 本库位库存
+     */
+    private String lockNum;
+    /**
+     * 确认数量/数量，赋值为库存数量
+     */
+    private String num;
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+    /**
+     * 单位
+     */
+    private String unit;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillFeign.java

@@ -0,0 +1,52 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+
+import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.OtherDataDto;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.*;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.CompleteHomeAppealDto;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealQuery;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.HomeAppealTaskQuery;
+import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.flowable.SubmitHomeAppealApplyDto;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "售后盘点")
+@FeignClient(
+        contextId = "terminal-WmsInventoryCheckbill",
+        name = "anrui-terminal",
+        path = "v1/inventory")
+public interface WmsInventoryCheckbillFeign {
+
+    @ApiOperation("盘点列表")
+    @PostMapping("/list")
+    @ResponseBody
+    ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> list(@RequestBody PagerQuery<WmsInventoryCheckbillPageQuery> pagerQuery);
+
+    @ApiOperation("盘点-库位商品列表")
+    @PostMapping("/fetchByKuWeiSid")
+    @ResponseBody
+    ResultBean<PagerVo<WmsInventoryCheckbillGoodsPageVo>> fetchByKuWeiSid(@RequestBody PagerQuery<WmsInventoryCheckbillGoodsPageQuery> pagerQuery);
+
+    @ApiOperation("办理/扫码保存")
+    @PostMapping("/saveInventoryInfo")
+    @ResponseBody
+    ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto);
+
+    @ApiOperation("扫描商品码")
+    @GetMapping("/scan")
+    @ResponseBody
+    public ResultBean<HandleBean> scan(@RequestParam("sid") String sid,@RequestParam("content") String content,@RequestParam("houseSid") String houseSid);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WmsInventoryCheckbillGoodsDto implements Dto {
+
+    /**
+     * 损坏数量
+     */
+    private String badNum;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 确认数量/数量
+     */
+    private String num;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillGoodsPageQuery implements Query {
+
+    /**
+     * 盘点单sid
+     */
+    private String sid;
+    /**
+     * 库位sid
+     */
+    private String houseSid;
+    private String names;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageVo.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillGoodsPageVo implements Vo {
+
+    /**
+     * 点击办理时需要的数据
+     */
+    private HandleBean handleBean;
+    private String kuCun;
+    private String panSun;
+    private String shiPan;
+    private String yingKui;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillPageQuery implements Query {
+
+    private String menuSid;
+    /**
+     * 仓库/库区/库位
+     */
+    private String names;
+    /**
+     * 组织机构sid
+     */
+    private String orgPath;
+    private String userSid;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageVo.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillPageVo implements Vo {
+
+    @ApiModelProperty("盘点单sid")
+    private String sid;
+    @ApiModelProperty("库位sid")
+    private String houseSid;
+    @ApiModelProperty("仓库-库区-库位")
+    private String title;
+    @ApiModelProperty("应盘数量")
+    private String totalNumber;
+    @ApiModelProperty("未盘数量")
+    private String surplusNumber;
+    @ApiModelProperty("盘亏数量")
+    private String lossNumber;
+    @ApiModelProperty("盘损数量")
+    private String damageNumber;
+    @ApiModelProperty("盘盈数量")
+    private String profitNumber;
+    @ApiModelProperty("实盘数量")
+    private String actualNumber;
+    @ApiModelProperty("是否显示按钮")
+    private Boolean showBtn = true;
+}

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

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.wms.inventorycheckbill;
+
+import com.yxt.anrui.terminal.api.autoservice.deliveryPlan.OtherDataDto;
+import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@Api(tags = "售后盘点")
+@RestController
+@RequestMapping("v1/inventory")
+public class WmsInventoryCheckbillRest implements WmsInventoryCheckbillFeign {
+
+    @Autowired
+    private WmsInventoryCheckbillService wmsInventoryCheckbillService;
+
+    @Override
+    public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> list(PagerQuery<WmsInventoryCheckbillPageQuery> pagerQuery) {
+        return wmsInventoryCheckbillService.pdlist(pagerQuery);
+    }
+
+    @Override
+    public ResultBean<PagerVo<WmsInventoryCheckbillGoodsPageVo>> fetchByKuWeiSid(PagerQuery<WmsInventoryCheckbillGoodsPageQuery> pagerQuery) {
+        return wmsInventoryCheckbillService.fetchByKuWeiSid(pagerQuery);
+    }
+
+    @Override
+    public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) {
+        return wmsInventoryCheckbillService.saveInventoryInfo(dto);
+    }
+
+    @Override
+    public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
+        return wmsInventoryCheckbillService.scan(sid, content, houseSid);
+    }
+}

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

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.wms.inventorycheckbill;
+
+import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
+import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailFile;
+import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListQuery;
+import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListVo;
+import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillFeign;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class WmsInventoryCheckbillService {
+
+    @Resource
+    private WmsInventoryCheckbillFeign wmsInventoryCheckbillFeign;
+
+    public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> pdlist(PagerQuery<WmsInventoryCheckbillPageQuery> pagerQuery) {
+        return wmsInventoryCheckbillFeign.appDetailRackPageList(pagerQuery);
+    }
+
+    public ResultBean<PagerVo<WmsInventoryCheckbillGoodsPageVo>> fetchByKuWeiSid(PagerQuery<WmsInventoryCheckbillGoodsPageQuery> pagerQuery) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> query = new PagerQuery<>();
+        WmsInventoryCheckbillDetailRackGoodPageListQuery wmsInventoryCheckbillDetailRackGoodPageListQuery = new WmsInventoryCheckbillDetailRackGoodPageListQuery();
+        WmsInventoryCheckbillGoodsPageQuery params = pagerQuery.getParams();
+        wmsInventoryCheckbillDetailRackGoodPageListQuery.setBillSid(params.getSid());
+        wmsInventoryCheckbillDetailRackGoodPageListQuery.setWarehouseRackSid(params.getHouseSid());
+        wmsInventoryCheckbillDetailRackGoodPageListQuery.setNames(params.getNames());
+        query.setParams(wmsInventoryCheckbillDetailRackGoodPageListQuery);
+        PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> data = wmsInventoryCheckbillFeign.detailRackGoodPageList(query).getData();
+        PagerVo<WmsInventoryCheckbillGoodsPageVo> wmsInventoryCheckbillGoodsPageVoPagerVo = new PagerVo<>();
+        for (WmsInventoryCheckbillDetailRackGoodPageListVo record : data.getRecords()) {
+            WmsInventoryCheckbillGoodsPageVo wmsInventoryCheckbillGoodsPageVo = new WmsInventoryCheckbillGoodsPageVo();
+            wmsInventoryCheckbillGoodsPageVo.setKuCun(record.getBookCount().toString());
+            wmsInventoryCheckbillGoodsPageVo.setShiPan(record.getRealCount().toString());
+            wmsInventoryCheckbillGoodsPageVo.setYingKui(record.getProfitAndLoseCount().toString());
+            wmsInventoryCheckbillGoodsPageVo.setPanSun(record.getLossCount().toString());
+            HandleBean handleBean = new HandleBean();
+            handleBean.setBadNum(record.getLossCount().toString());
+            List<WmsInventoryCheckbillDetailFile> fileList = record.getFileList();
+            List<String> files = new ArrayList<>();
+            for (WmsInventoryCheckbillDetailFile wmsInventoryCheckbillDetailFile : fileList) {
+                files.add(wmsInventoryCheckbillDetailFile.getUrl());
+            }
+            handleBean.setFiles(files);
+            handleBean.setGoodsID(record.getGoodsID());
+            handleBean.setGoodsName(record.getGoodsSkuTitle());
+            handleBean.setGoodsSkuCode(record.getGoodsSkuCode());
+            handleBean.setLockNum(record.getBookCount().toString());
+            handleBean.setNum(record.getBookCount().toString());
+            handleBean.setRemarks(record.getRemarks());
+            handleBean.setSid(record.getSid());
+            handleBean.setUnit(record.getUnit());
+            wmsInventoryCheckbillGoodsPageVo.setHandleBean(handleBean);
+            wmsInventoryCheckbillGoodsPageVoPagerVo.getRecords().add(wmsInventoryCheckbillGoodsPageVo);
+        }
+        return rb.success().setData(wmsInventoryCheckbillGoodsPageVoPagerVo);
+    }
+
+    public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) {
+        return wmsInventoryCheckbillFeign.saveInventoryInfo(dto);
+    }
+
+    public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
+        return wmsInventoryCheckbillFeign.scan(sid, content, houseSid);
+    }
+}

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

@@ -0,0 +1,35 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillDetailFile implements Vo {
+
+    private String url;
+}

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

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
+public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query {
+
+    @ApiModelProperty("盘点sid")
+    private String billSid;
+    @ApiModelProperty("库位sid")
+    private String warehouseRackSid; // 库位sid
+    @ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle; // 商品名称
+    @ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+
+    private String names;
+}

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

@@ -0,0 +1,95 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
+
+
+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.ArrayList;
+import java.util.List;
+
+/**
+ * Project: yxt-wms(仓储) <br/>
+ * File: WmsInventoryCheckbillDetailVo.java <br/>
+ * Class: com.yxt.wms.api.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailVo <br/>
+ * Description: 库存盘点-明细 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-22 09:25:02 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
+public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("商品ID")
+    private String goodsID; // 商品ID
+    @ApiModelProperty("商品名称")
+    private String goodsSkuTitle; // 商品名称
+    @ApiModelProperty("图号")
+    private String goodsSkuCode; // 图号
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+    @ApiModelProperty("库区名称")
+    private String warehouseArea;
+    @ApiModelProperty("库位名称")
+    private String warehouseRackName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("成本单价")
+    private BigDecimal cost;
+    @ApiModelProperty("应盘数量")
+    private BigDecimal bookCount;
+    @ApiModelProperty("应盘金额")
+    private BigDecimal bookAmount;
+    @ApiModelProperty("实盘数量")
+    private BigDecimal realCount;
+    @ApiModelProperty("实盘金额")
+    private BigDecimal realAmount;
+    @ApiModelProperty("状态")
+    private String state;
+    @ApiModelProperty("盈亏数量")
+    private BigDecimal profitAndLoseCount;
+    @ApiModelProperty("盈亏金额")
+    private BigDecimal profitAndLoseAmount;
+    @ApiModelProperty("盘损数量")
+    private BigDecimal lossCount;
+    @ApiModelProperty("盘损金额")
+    private BigDecimal lossAmount;
+    @ApiModelProperty("备注")
+    private String remarks;
+    @ApiModelProperty("附件")
+    private List<WmsInventoryCheckbillDetailFile> fileList = new ArrayList<>();
+}

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

@@ -0,0 +1,46 @@
+package com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill;
+
+
+import com.yxt.anrui.terminal.api.wms.inventorycheckbill.HandleBean;
+import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillGoodsDto;
+import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillPageQuery;
+import com.yxt.anrui.terminal.api.wms.inventorycheckbill.WmsInventoryCheckbillPageVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @Author
+ * @Date
+ * @Description
+ */
+@Api(tags = "售后盘点")
+@FeignClient(
+        contextId = "yxt-wms-WmsInventoryCheckbill",
+        name = "yxt-wms",
+        path = "v1/wmsinventorycheckbill")
+public interface WmsInventoryCheckbillFeign {
+
+    @ApiOperation("app-盘点-查看库位盘点列表")
+    @PostMapping("/appDetailRackPageList")
+    public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> appDetailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillPageQuery> pq);
+
+
+    @ApiOperation("查看库位商品盘点列表")
+    @PostMapping("/detailRackGoodPageList")
+    public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq);
+
+    @ApiOperation("办理/扫码保存")
+    @PostMapping("/saveInventoryInfo")
+    @ResponseBody
+    ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto);
+
+    @ApiOperation("扫描商品码")
+    @GetMapping("/scan")
+    @ResponseBody
+    public ResultBean<HandleBean> scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java

@@ -311,9 +311,11 @@ public class AsTechTitleApplyService extends MybatisBaseService<AsTechTitleApply
 			asTechTitleDetailDetailsVo.setTitleNameValue(asTechTitle.getTitleNameValue());
 			asTechTitleDetailDetailsVo.setWeight(asTechTitle.getWeight());
 			AsTechTitleDetail asTechTitleDetail = asTechTitleDetailService.selByTechSid(techSid);
-			if (StringUtils.isNotBlank(asTechTitleDetail.getTechSid())){
-				asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(asTechTitleDetail.getTechSid().split(",")));
-				asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(asTechTitleDetail.getTechName().split(",")));
+			if (asTechTitleDetail != null){
+				if (StringUtils.isNotBlank(asTechTitleDetail.getTechSid())){
+					asTechTitleDetailDetailsVo.setTechSids(Arrays.asList(asTechTitleDetail.getTechSid().split(",")));
+					asTechTitleDetailDetailsVo.setTechNames(Arrays.asList(asTechTitleDetail.getTechName().split(",")));
+				}
 			}
 			asTechTitleDetailDetailsVos.add(asTechTitleDetailDetailsVo);
 		}

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

@@ -32,6 +32,10 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbill.*;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDetailsVo;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
 import io.swagger.annotations.Api;
@@ -61,126 +65,152 @@ import java.util.List;
 @RequestMapping("v1/wmsinventorycheckbill")
 public class WmsInventoryCheckbillRest {
 
-	@Autowired
-	private WmsInventoryCheckbillService wmsInventoryCheckbillService;
-
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<WmsInventoryCheckbillVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<WmsInventoryCheckbillVo> pv = wmsInventoryCheckbillService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("新建盘点单")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){
-		return wmsInventoryCheckbillService.saveOrUpdateDto(dto);
-	}
-
-	@ApiOperation("生成盘点报告")
-	@PostMapping("/createReport")
-	public ResultBean createReport(@RequestParam("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		wmsInventoryCheckbillService.createReport(sid);
-		return rb.success();
-	}
-
-	@ApiOperation("查看盘点报告")
-	@PostMapping("/viewReport")
-	public ResultBean<WmsInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid);
-		return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo);
-	}
-
-	@ApiOperation("生成盘点报告PDF")
-	@PostMapping("/createPdf")
-	public ResultBean<String> createPdf(@RequestParam("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		String url = wmsInventoryCheckbillService.createPdf(sid);
-		return rb.success().success().setData(url);
-	}
-
-	@ApiOperation("根据sid批量删除")
+    @Autowired
+    private WmsInventoryCheckbillService wmsInventoryCheckbillService;
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<WmsInventoryCheckbillVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsInventoryCheckbillVo> pv = wmsInventoryCheckbillService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("新建盘点单")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto) {
+        return wmsInventoryCheckbillService.saveOrUpdateDto(dto);
+    }
+
+    @ApiOperation("生成盘点报告")
+    @PostMapping("/createReport")
+    public ResultBean createReport(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsInventoryCheckbillService.createReport(sid);
+        return rb.success();
+    }
+
+    @ApiOperation("查看盘点报告")
+    @PostMapping("/viewReport")
+    public ResultBean<WmsInventoryCheckbillReportDetailsVo> viewReport(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsInventoryCheckbillReportDetailsVo wmsInventoryCheckbillReportDetailsVo = wmsInventoryCheckbillService.viewReport(sid);
+        return rb.success().success().setData(wmsInventoryCheckbillReportDetailsVo);
+    }
+
+    @ApiOperation("生成盘点报告PDF")
+    @PostMapping("/createPdf")
+    public ResultBean<String> createPdf(@RequestParam("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String url = wmsInventoryCheckbillService.createPdf(sid);
+        return rb.success().success().setData(url);
+    }
+
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		return wmsInventoryCheckbillService.delAll(sids);
-	}
-
-	@ApiOperation("盘点-查看库位盘点列表")
-	@PostMapping("/detailRackPageList")
-	public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackPageListVo>> detailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackPageListQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<WmsInventoryCheckbillDetailRackPageListVo> pv = wmsInventoryCheckbillService.detailRackPageList(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("盘点-查看商品盘点列表")
-	@PostMapping("/detailGoodPageList")
-	public ResultBean<PagerVo<WmsInventoryCheckbillDetailGoodPageListVo>> detailGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> pv = wmsInventoryCheckbillService.detailGoodPageList(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("查看库区商品盘点列表")
-	@PostMapping("/detailRackGoodPageList")
-	public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq);
-		return rb.success().setData(pv);
-	}
-
-	@ApiOperation("提交")
-	@PostMapping("/submitApply")
-	public ResultBean submitApply(@Valid @RequestBody SubmitInventoryCheckDto dto) {
-		return wmsInventoryCheckbillService.submitApply(dto);
-	}
-
-	@ApiOperation(value = "办理（同意）")
-	@PostMapping("/complete")
-	public ResultBean complete(@Valid @RequestBody CompleteInventoryCheckDto query) {
-		BusinessVariables bv = new BusinessVariables();
-		BeanUtil.copyProperties(query, bv);
-		bv.setModelId("");
-		return wmsInventoryCheckbillService.complete(bv);
-	}
-
-	@ApiOperation(value = "获取上一个环节")
-	@GetMapping(value = "/getPreviousNodesForReject")
-	ResultBean<List<InventoryCheckNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap InventoryCheckNodeQuery query) {
-		return wmsInventoryCheckbillService.getPreviousNodesForReject(query);
-	}
-
-	@ApiOperation(value = "获取下一个环节")
-	@GetMapping(value = "/getNextNodesForSubmit")
-	ResultBean<List<InventoryCheckNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap InventoryCheckNodeQuery query) {
-		return wmsInventoryCheckbillService.getNextNodesForSubmit(query);
-	}
-
-	@ApiOperation(value = "驳回任务")
-	@PostMapping(value = "/reject")
-	public ResultBean taskReject(@Valid @RequestBody InventoryCheckTaskQuery query) {
-		return wmsInventoryCheckbillService.taskReject(query);
-	}
-
-	@ApiOperation(value = "撤回流程")
-	@PostMapping(value = "/revokeProcess")
-	public ResultBean revokeProcess(@Valid @RequestBody InventoryCheckTaskQuery query) {
-		return wmsInventoryCheckbillService.revokeProcess(query);
-	}
-
-	@ApiOperation(value = "终止任务")
-	@PostMapping(value = "/breakProcess")
-	public ResultBean breakProcess(@Valid @RequestBody InventoryCheckTaskQuery query) {
-		return wmsInventoryCheckbillService.breakProcess(query);
-	}
-
-	@ApiOperation(value = "加签")
-	@PostMapping(value = "/delegate")
-	@ResponseBody
-	public ResultBean delegate(@RequestBody InventoryCheckDelegateQuery query) {
-		return wmsInventoryCheckbillService.delegate(query);
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        return wmsInventoryCheckbillService.delAll(sids);
+    }
+
+    @ApiOperation("盘点-查看库位盘点列表")
+    @PostMapping("/detailRackPageList")
+    public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackPageListVo>> detailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackPageListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsInventoryCheckbillDetailRackPageListVo> pv = wmsInventoryCheckbillService.detailRackPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("盘点-查看商品盘点列表")
+    @PostMapping("/detailGoodPageList")
+    public ResultBean<PagerVo<WmsInventoryCheckbillDetailGoodPageListVo>> detailGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailGoodPageListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsInventoryCheckbillDetailGoodPageListVo> pv = wmsInventoryCheckbillService.detailGoodPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("查看库位商品盘点列表")
+    @PostMapping("/detailRackGoodPageList")
+    public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> pv = wmsInventoryCheckbillService.detailRackGoodPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    /*********************************************************移动端************************************************************/
+
+    @ApiOperation("app-盘点-查看库位盘点列表")
+    @PostMapping("/appDetailRackPageList")
+    public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> appDetailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillPageQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<WmsInventoryCheckbillPageVo> pv = wmsInventoryCheckbillService.appDetailRackPageList(pq);
+        return rb.success().setData(pv);
+    }
+
+    @ApiOperation("办理/扫码保存")
+    @PostMapping("/saveInventoryInfo")
+    @ResponseBody
+    ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto) {
+        return wmsInventoryCheckbillService.saveInventoryInfo(dto);
+    }
+
+    @ApiOperation("扫描商品码")
+    @GetMapping("/scan")
+    @ResponseBody
+    public ResultBean<HandleBean> scan(@RequestParam("sid") String sid, @RequestParam("content") String content, @RequestParam("houseSid") String houseSid) {
+        return wmsInventoryCheckbillService.scan(sid, content, houseSid);
+    }
+
+    /*********************************************************流程************************************************************/
+
+    @ApiOperation("提交")
+    @PostMapping("/submitApply")
+    public ResultBean submitApply(@Valid @RequestBody SubmitInventoryCheckDto dto) {
+        return wmsInventoryCheckbillService.submitApply(dto);
+    }
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody CompleteInventoryCheckDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId("");
+        return wmsInventoryCheckbillService.complete(bv);
+    }
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<InventoryCheckNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap InventoryCheckNodeQuery query) {
+        return wmsInventoryCheckbillService.getPreviousNodesForReject(query);
+    }
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<InventoryCheckNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap InventoryCheckNodeQuery query) {
+        return wmsInventoryCheckbillService.getNextNodesForSubmit(query);
+    }
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody InventoryCheckTaskQuery query) {
+        return wmsInventoryCheckbillService.taskReject(query);
+    }
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody InventoryCheckTaskQuery query) {
+        return wmsInventoryCheckbillService.revokeProcess(query);
+    }
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody InventoryCheckTaskQuery query) {
+        return wmsInventoryCheckbillService.breakProcess(query);
+    }
+
+    @ApiOperation(value = "加签")
+    @PostMapping(value = "/delegate")
+    @ResponseBody
+    public ResultBean delegate(@RequestBody InventoryCheckDelegateQuery query) {
+        return wmsInventoryCheckbillService.delegate(query);
+    }
 }

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

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailGoodPageListVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackPageListVo;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -80,4 +81,6 @@ public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryChec
 	String checkState(String deptSid);
 
     int updateFlowFiled(Map<String, Object> beanToMap);
+
+    IPage<WmsInventoryCheckbillPageVo> appDetailRackPageList(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryCheckbill> qw);
 }

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

@@ -215,4 +215,29 @@
 		</if>
 		WHERE sid=#{sid}
     </update>
+
+	<select id="appDetailRackPageList"
+            resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo">
+		SELECT
+		c.sid,
+		d.warehouseRackSid AS houseSid,
+		CONCAT(
+		d.warehouseName,
+		'-',
+		d.warehouseArea,
+		'-',
+		d.warehouseRackName
+		) AS title,
+		SUM(bookCount) - SUM(realCount) AS surplusNumber,
+		SUM(bookCount) AS totalNumber,
+		SUM(loseCount) AS lossNumber,
+		SUM(lossCount) AS damageNumber,
+		SUM(profitCount) AS profitNumber,
+		SUM(realCount) AS actualNumber
+		FROM
+		wms_inventory_checkbill_detail d
+		LEFT JOIN wms_inventory_checkbill c
+		ON d.billSid = c.sid
+		<where> ${ew.sqlSegment} </where>
+    </select>
 </mapper>

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

@@ -43,7 +43,12 @@ import com.yxt.wms.biz.inventory.wmsinventory.WmsInventory;
 import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryService;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbill.flowable.*;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageQuery;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillPageVo;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*;
+import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
 import com.yxt.wms.feign.flowable.flow.FlowableFeign;
 import com.yxt.wms.feign.flowable.flow.ProcDefEnum;
@@ -103,6 +108,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     @Autowired
     private WmsInventoryService wmsInventoryService;
     @Autowired
+    private WmsInventoryRecordService wmsInventoryRecordService;
+    @Autowired
     private WmsWarehouseRackService wmsWarehouseRackService;
     @Autowired
     private WmsWarehouseAreaService wmsWarehouseAreaService;
@@ -255,6 +262,10 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
             qw.like("goodsSkuCode", query.getGoodsSkuCode());
         }
+        //移动端查询条件
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("goodsID", query.getNames()).or().like("goodsSkuTitle", query.getNames()).or().like("goodsSkuCode", query.getNames()));
+        }
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillDetailRackGoodPageListVo> pagging = baseMapper.detailRackGoodPageList(page, qw);
         PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> p = PagerUtil.pageToVo(pagging, null);
@@ -761,4 +772,89 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         flowFeign.delegate(delegateQuery);
         return rb.success();
     }
+
+    public PagerVo<WmsInventoryCheckbillPageVo> appDetailRackPageList(PagerQuery<WmsInventoryCheckbillPageQuery> pq) {
+        WmsInventoryCheckbillPageQuery query = pq.getParams();
+        QueryWrapper<WmsInventoryCheckbill> qw = new QueryWrapper<>();
+        //========================================数据授权开始
+        if (StringUtils.isNotBlank(query.getMenuSid())) {
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("s.orgSidPath", orgSidPath);
+                } else if ("5".equals(orgLevelKey)) {
+                    qw.eq("c.createBySid", query.getUserSid());
+                } else {
+                    PagerVo<WmsInventoryCheckbillPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            } else {
+                PagerVo<WmsInventoryCheckbillPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }
+        if (StringUtils.isNotBlank(query.getNames())) {
+            qw.and(wrapper -> wrapper.like("d.warehouseName", query.getNames()).or().like("d.warehouseArea", query.getNames()).or().like("d.warehouseRackName", query.getNames()));
+        }
+        qw.eq("c.checkState",'1');
+        qw.groupBy("d.warehouseRackSid");
+        IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
+        IPage<WmsInventoryCheckbillPageVo> pagging = baseMapper.appDetailRackPageList(page, qw);
+        PagerVo<WmsInventoryCheckbillPageVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsInventoryCheckbillDetailService.saveInventoryInfo(dto);
+        return rb.success();
+    }
+
+    public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
+        ResultBean rb = ResultBean.fireFail();
+        if (content.contains("#")){
+            return rb.setMsg("请扫描商品码");
+        }
+        HandleBean handleBean = wmsInventoryCheckbillDetailService.scan(sid,content,houseSid);
+        if (handleBean == null){
+            List<WmsInventory> wmsInventories = wmsInventoryService.getListByGoodsID(content).getData();
+            if (!wmsInventories.isEmpty()){
+                for (WmsInventory wmsInventory : wmsInventories) {
+                    WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(wmsInventory.getWarehouseRackSid());
+                    WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
+                    return rb.setMsg("本商品不属于本库位，属于" + wmsWarehouseArea.getAreaName() + "库区" + wmsWarehouseRack.getRackName() + "库位。");
+                }
+            }else {
+                String billNo = wmsInventoryRecordService.selByGoodsID(content);
+                if (StringUtils.isBlank(billNo)){
+                    return rb.setMsg("商品码不正确");
+                }else {
+                    return rb.setMsg("本商品已在" + billNo + "单据编号中出库。");
+                }
+            }
+        }
+        return rb.success().setData(handleBean);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailGoodPageListVo.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -90,5 +91,5 @@ public class WmsInventoryCheckbillDetailGoodPageListVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("附件")
-    private List<WmsInventoryCheckbillDetailFile> fileList;
+    private List<WmsInventoryCheckbillDetailFile> fileList = new ArrayList<>();
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java

@@ -29,12 +29,15 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -63,4 +66,12 @@ public interface WmsInventoryCheckbillDetailMapper extends BaseMapper<WmsInvento
 	List<WmsInventoryCheckbillReportSumVo> reportSumWare(String billSid);
 
 	List<WmsInventoryCheckbillReportSumVo> reportSumArea(String billSid);
+
+    void saveInventoryInfoZC(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("num") String num);
+
+	void saveInventoryInfoPY(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("pyCount") BigDecimal pyCount);
+
+	void saveInventoryInfoPK(@Param("dto") WmsInventoryCheckbillGoodsDto dto,@Param("pkCount") BigDecimal pkCount);
+
+    HandleBean scan(@Param("sid") String sid,@Param("content") String content,@Param("houseSid") String houseSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.xml

@@ -78,4 +78,34 @@
 		WHERE wicd.billSid = #{billSid}
 		GROUP BY wicd.warehouseAreaSid
 	</select>
+
+	<update id="saveInventoryInfoZC">
+		update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = 0,remarks = #{dto.remarks} where sid = #{dto.sid}
+	</update>
+
+	<update id="saveInventoryInfoPY">
+		update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = #{pyCount},loseCount = 0,remarks = #{dto.remarks} where sid = #{dto.sid}
+	</update>
+
+	<update id="saveInventoryInfoPK">
+		update wms_inventory_checkbill_detail set lossCount = #{dto.badNum},realCount = #{dto.num},profitCount = 0,loseCount = #{pkCount},remarks = #{dto.remarks} where sid = #{dto.sid}
+	</update>
+
+	<select id="scan" resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean">
+		SELECT
+				lossCount AS badNum,
+				goodsID,
+				goodsSkuTitle AS goodsName,
+				goodsSkuCode,
+				bookCount AS lockNum,
+				realCount AS num,
+				remarks,
+				sid,
+				unit
+		FROM
+				wms_inventory_checkbill_detail
+		WHERE billSid = #{sid}
+		  AND goodsID = #{content}
+		  AND warehouseRackSid = #{houseSid}
+	</select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListQuery.java

@@ -58,4 +58,9 @@ public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query {
     private String goodsSkuTitle; // 商品名称
     @ApiModelProperty("图号")
     private String goodsSkuCode; // 图号
+
+    /*
+    * 移动端查询条件
+    * */
+    private String names;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackGoodPageListVo.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -90,5 +91,5 @@ public class WmsInventoryCheckbillDetailRackGoodPageListVo implements Vo {
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("附件")
-    private List<WmsInventoryCheckbillDetailFile> fileList;
+    private List<WmsInventoryCheckbillDetailFile> fileList = new ArrayList<>();
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailRackPageListQuery.java

@@ -58,4 +58,12 @@ public class WmsInventoryCheckbillDetailRackPageListQuery implements Query {
     private String warehouseAreaSid; // 库区sid
     @ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
+
+    /*
+     * 移动端查询条件
+     * */
+    private String userSid;
+    private String orgPath;
+    private String menuSid;
+    private String names;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java

@@ -26,11 +26,14 @@
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.HandleBean;
+import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.WmsInventoryCheckbillGoodsDto;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo;
 import com.yxt.common.base.service.MybatisBaseService;
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,38 +52,55 @@ import java.util.List;
  */
 @Service
 public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsInventoryCheckbillDetailMapper, WmsInventoryCheckbillDetail> {
-	
-	public void insertByDto(WmsInventoryCheckbillDetailDto dto){
-		WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public WmsInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid){
-		WmsInventoryCheckbillDetail entity = fetchBySid(sid);
-		WmsInventoryCheckbillDetailDetailsVo vo = new WmsInventoryCheckbillDetailDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
 
-	public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
-	}
+    public void insertByDto(WmsInventoryCheckbillDetailDto dto) {
+        WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
 
-	public List<WmsInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid) {
-		return baseMapper.selByMainSid(billSid);
-	}
+    public WmsInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid) {
+        WmsInventoryCheckbillDetail entity = fetchBySid(sid);
+        WmsInventoryCheckbillDetailDetailsVo vo = new WmsInventoryCheckbillDetailDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
 
-	public List<WmsInventoryCheckbillReportSumVo> reportSum(String sid, String sumType) {
-		List<WmsInventoryCheckbillReportSumVo> wmsInventoryCheckbillReportSumVos = new ArrayList<>();
-		if ("total".equals(sumType)){
-			WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = baseMapper.reportSumTotal(sid);
-			wmsInventoryCheckbillReportSumVos.add(wmsInventoryCheckbillReportSumVo);
-		}else if ("ware".equals(sumType)){
-			wmsInventoryCheckbillReportSumVos = baseMapper.reportSumWare(sid);
-		}else if ("area".equals(sumType)){
-			wmsInventoryCheckbillReportSumVos = baseMapper.reportSumArea(sid);
-		}
-		return wmsInventoryCheckbillReportSumVos;
-	}
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
+
+    public List<WmsInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid) {
+        return baseMapper.selByMainSid(billSid);
+    }
+
+    public List<WmsInventoryCheckbillReportSumVo> reportSum(String sid, String sumType) {
+        List<WmsInventoryCheckbillReportSumVo> wmsInventoryCheckbillReportSumVos = new ArrayList<>();
+        if ("total".equals(sumType)) {
+            WmsInventoryCheckbillReportSumVo wmsInventoryCheckbillReportSumVo = baseMapper.reportSumTotal(sid);
+            wmsInventoryCheckbillReportSumVos.add(wmsInventoryCheckbillReportSumVo);
+        } else if ("ware".equals(sumType)) {
+            wmsInventoryCheckbillReportSumVos = baseMapper.reportSumWare(sid);
+        } else if ("area".equals(sumType)) {
+            wmsInventoryCheckbillReportSumVos = baseMapper.reportSumArea(sid);
+        }
+        return wmsInventoryCheckbillReportSumVos;
+    }
+
+    public void saveInventoryInfo(WmsInventoryCheckbillGoodsDto dto) {
+        int i = new BigDecimal(dto.getLockNum()).compareTo(new BigDecimal(dto.getNum()));
+        if (i < 0) {//盘盈
+            BigDecimal pyCount = new BigDecimal(dto.getNum()).subtract(new BigDecimal(dto.getLockNum()));
+            baseMapper.saveInventoryInfoPY(dto, pyCount);
+        } else if (i > 0) {//盘亏
+            BigDecimal pkCount = new BigDecimal(dto.getLockNum()).subtract(new BigDecimal(dto.getNum()));
+            baseMapper.saveInventoryInfoPK(dto, pkCount);
+        } else {
+            baseMapper.saveInventoryInfoZC(dto, dto.getNum());
+        }
+    }
+
+    public HandleBean scan(String sid, String content, String houseSid) {
+        return baseMapper.scan(sid, content, houseSid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/HandleBean.java

@@ -0,0 +1,44 @@
+package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HandleBean {
+
+    /**
+     * 损坏数量，默认 0
+     */
+    private String badNum;
+    private List<String> files;
+    /**
+     * 商品ID
+     */
+    private String goodsID;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 本库位库存
+     */
+    private String lockNum;
+    /**
+     * 确认数量/数量，赋值为库存数量
+     */
+    private String num;
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+    /**
+     * 单位
+     */
+    private String unit;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsDto.java

@@ -0,0 +1,35 @@
+package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WmsInventoryCheckbillGoodsDto implements Dto {
+
+    /**
+     * 损坏数量
+     */
+    private String badNum;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 确认数量/数量
+     */
+    private String num;
+    /**
+     * 库存数量
+     */
+    private String lockNum;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageQuery.java

@@ -0,0 +1,19 @@
+package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillPageQuery implements Query {
+
+    private String menuSid;
+    /**
+     * 仓库/库区/库位
+     */
+    private String names;
+    /**
+     * 组织机构sid
+     */
+    private String orgPath;
+    private String userSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillPageVo.java

@@ -0,0 +1,30 @@
+package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WmsInventoryCheckbillPageVo implements Vo {
+
+    @ApiModelProperty("盘点单sid")
+    private String sid;
+    @ApiModelProperty("库位sid")
+    private String houseSid;
+    @ApiModelProperty("仓库-库区-库位")
+    private String title;
+    @ApiModelProperty("应盘数量")
+    private String totalNumber;
+    @ApiModelProperty("未盘数量")
+    private String surplusNumber;
+    @ApiModelProperty("盘亏数量")
+    private String lossNumber;
+    @ApiModelProperty("盘损数量")
+    private String damageNumber;
+    @ApiModelProperty("盘盈数量")
+    private String profitNumber;
+    @ApiModelProperty("实盘数量")
+    private String actualNumber;
+    @ApiModelProperty("是否显示按钮")
+    private Boolean showBtn = false;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.java

@@ -86,4 +86,6 @@ public interface WmsInventoryRecordMapper extends BaseMapper<WmsInventoryRecord>
     List<WmsInventoryRecord> selBySourceSid(String sid);
 
     List<WmsInventoryRecord> selBySourceSidAndSkuCode(@Param("sid") String sid,@Param("goodsSkuCode") String goodsSkuCode);
+
+    String selByGoodsID(String content);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordMapper.xml

@@ -171,4 +171,13 @@
         WHERE
             r.sourceBillSid = #{sid} and r.goodsSkuCode = #{goodsSkuCode}
     </select>
+
+    <select id="selByGoodsID" resultType="java.lang.String">
+        SELECT
+                billNo
+        FROM
+                wms_inventory_record
+        WHERE billType = '0'
+          AND goodsID = #{content}
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryrecord/WmsInventoryRecordService.java

@@ -364,4 +364,8 @@ public class WmsInventoryRecordService extends MybatisBaseService<WmsInventoryRe
     public List<WmsInventoryRecord> selBySourceSidAndSkuCode(String sid, String goodsSkuCode) {
         return baseMapper.selBySourceSidAndSkuCode(sid,goodsSkuCode);
     }
+
+    public String selByGoodsID(String content) {
+        return baseMapper.selByGoodsID(content);
+    }
 }