1

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

@@ -0,0 +1,11 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import lombok.Data;
+
+@Data
+public class AppInventoryCheckbill {
+
+    private String id;
+    private String dictValue;
+    private Extra extra;
+}

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

@@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Author
  * @Date
@@ -36,8 +38,23 @@ public interface AppInventoryCheckbillFeign {
     @ResponseBody
     ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto);
 
+    @ApiOperation("盘盈保存")
+    @PostMapping("/saveInventoryInfo2")
+    @ResponseBody
+    ResultBean saveInventoryInfo2(@RequestBody WmsInventoryCheckbillGoodsPyDto dto);
+
     @ApiOperation("扫描商品码")
     @GetMapping("/scan")
     @ResponseBody
     public ResultBean<HandleBean> scan(@RequestParam("sid") String sid,@RequestParam("content") String content,@RequestParam("houseSid") String houseSid);
+
+    @ApiOperation("检索商品")
+    @GetMapping("/selectGoods")
+    @ResponseBody
+    public ResultBean<List<AppInventoryCheckbill>> selectGoods(@RequestParam(value = "name",required = false) String name, @RequestParam("orgPath") String orgPath);
+
+    @ApiOperation("检索供应商")
+    @GetMapping("/selectProvider")
+    @ResponseBody
+    public ResultBean<List<AppInventoryCheckbill>> selectProvider(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath);
 }

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

@@ -0,0 +1,10 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import lombok.Data;
+
+@Data
+public class Extra {
+
+    private String unit;
+    private String goodsSkuCode;
+}

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

@@ -21,6 +21,10 @@ public class WmsInventoryCheckbillGoodsDto implements Dto {
      * 确认数量/数量
      */
     private String num;
+    /**
+     * 库存数量
+     */
+    private String lockNum;
     /**
      * 备注
      */

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

@@ -14,5 +14,5 @@ public class WmsInventoryCheckbillGoodsPageQuery implements Query {
      * 库位sid
      */
     private String houseSid;
-    private String names;
+    private String name;
 }

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

@@ -0,0 +1,64 @@
+package com.yxt.anrui.terminal.api.wms.inventorycheckbill;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class WmsInventoryCheckbillGoodsPyDto implements Dto {
+
+    /**
+     * 损坏数量
+     */
+    private String badNum;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 确认数量/数量
+     */
+    private String num;
+    /**
+     * 库存数量
+     */
+    private String lockNum;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 商品记录sid
+     */
+    private String sid;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 商品sid
+     */
+    private String goodsSid;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 库位sid
+     */
+    private String houseSid;
+    /**
+     * 盘点单sid
+     */
+    private String panDianSid;
+    /**
+     * 供应商
+     */
+    private String provider;
+    private String providerSid;
+    /**
+     * 单位
+     */
+    private String unit;
+}

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

@@ -11,7 +11,7 @@ public class WmsInventoryCheckbillPageQuery implements Query {
     /**
      * 仓库/库区/库位
      */
-    private String names;
+    private String name;
     /**
      * 组织机构sid
      */

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"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin","com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

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

@@ -33,6 +33,8 @@ import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @Api(tags = "售后盘点")
 @RestController
 @RequestMapping("v1/inventory")
@@ -56,8 +58,23 @@ public class WmsInventoryCheckbillRest implements AppInventoryCheckbillFeign {
         return wmsInventoryCheckbillService.saveInventoryInfo(dto);
     }
 
+    @Override
+    public ResultBean saveInventoryInfo2(WmsInventoryCheckbillGoodsPyDto dto) {
+        return wmsInventoryCheckbillService.saveInventoryInfo2(dto);
+    }
+
     @Override
     public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
         return wmsInventoryCheckbillService.scan(sid, content, houseSid);
     }
+
+    @Override
+    public ResultBean<List<AppInventoryCheckbill>> selectGoods(String name, String orgPath) {
+        return wmsInventoryCheckbillService.selectGoods(name, orgPath);
+    }
+
+    @Override
+    public ResultBean<List<AppInventoryCheckbill>> selectProvider(String name, String orgPath) {
+        return wmsInventoryCheckbillService.selectProvider(name, orgPath);
+    }
 }

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

@@ -25,7 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.wms.inventorycheckbill;
 
+import com.yxt.anrui.fin.api.finbillapplication.PcSelBillVinNoPageVo;
 import com.yxt.anrui.terminal.api.wms.inventorycheckbill.*;
+import com.yxt.anrui.terminal.fegin.basegoodssku.BaseGoodsSkuFeign;
+import com.yxt.anrui.terminal.fegin.basegoodssku.GoodsDeptVo;
+import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoChoice;
+import com.yxt.anrui.terminal.fegin.basesupplierinfo.BaseSupplierInfoFeign;
 import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailFile;
 import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListQuery;
 import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillDetailRackGoodPageListVo;
@@ -33,10 +38,12 @@ import com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill.WmsInventoryCheckbillF
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 @Service
@@ -44,6 +51,10 @@ public class WmsInventoryCheckbillService {
 
     @Resource
     private WmsInventoryCheckbillFeign wmsInventoryCheckbillFeign;
+    @Autowired
+    private BaseSupplierInfoFeign baseSupplierInfoFeign;
+    @Autowired
+    private BaseGoodsSkuFeign baseGoodsSkuFeign;
 
     public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> pdlist(PagerQuery<WmsInventoryCheckbillPageQuery> pagerQuery) {
         return wmsInventoryCheckbillFeign.appDetailRackPageList(pagerQuery);
@@ -56,18 +67,33 @@ public class WmsInventoryCheckbillService {
         WmsInventoryCheckbillGoodsPageQuery params = pagerQuery.getParams();
         wmsInventoryCheckbillDetailRackGoodPageListQuery.setBillSid(params.getSid());
         wmsInventoryCheckbillDetailRackGoodPageListQuery.setWarehouseRackSid(params.getHouseSid());
-        wmsInventoryCheckbillDetailRackGoodPageListQuery.setNames(params.getNames());
+        wmsInventoryCheckbillDetailRackGoodPageListQuery.setName(params.getName());
         query.setParams(wmsInventoryCheckbillDetailRackGoodPageListQuery);
         PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> data = wmsInventoryCheckbillFeign.detailRackGoodPageList(query).getData();
+        Iterator<WmsInventoryCheckbillDetailRackGoodPageListVo> iterator = data.getRecords().iterator();
         PagerVo<WmsInventoryCheckbillGoodsPageVo> wmsInventoryCheckbillGoodsPageVoPagerVo = new PagerVo<>();
-        for (WmsInventoryCheckbillDetailRackGoodPageListVo record : data.getRecords()) {
+        List<WmsInventoryCheckbillGoodsPageVo> records = new ArrayList<>();
+        while (iterator.hasNext()){
+            WmsInventoryCheckbillDetailRackGoodPageListVo record = iterator.next();
+            if (record.getRealCount() != null){
+                if (record.getBookCount().compareTo(record.getRealCount()) == 0){
+                    iterator.remove();
+                    continue;
+                }
+            }
             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());
+            wmsInventoryCheckbillGoodsPageVo.setKuCun(record.getBookCount().toString());
+            if (record.getRealCount() != null){
+                wmsInventoryCheckbillGoodsPageVo.setShiPan(record.getRealCount().toString());
+            }
+            if (record.getProfitAndLoseCount() != null){
+                wmsInventoryCheckbillGoodsPageVo.setYingKui(record.getProfitAndLoseCount().toString());
+            }
+            if (record.getLossCount() != null){
+                wmsInventoryCheckbillGoodsPageVo.setPanSun(record.getLossCount().toString());
+                handleBean.setBadNum(record.getLossCount().toString());
+            }
             List<WmsInventoryCheckbillDetailFile> fileList = record.getFileList();
             List<String> files = new ArrayList<>();
             for (WmsInventoryCheckbillDetailFile wmsInventoryCheckbillDetailFile : fileList) {
@@ -83,8 +109,9 @@ public class WmsInventoryCheckbillService {
             handleBean.setSid(record.getSid());
             handleBean.setUnit(record.getUnit());
             wmsInventoryCheckbillGoodsPageVo.setHandleBean(handleBean);
-            wmsInventoryCheckbillGoodsPageVoPagerVo.getRecords().add(wmsInventoryCheckbillGoodsPageVo);
+            records.add(wmsInventoryCheckbillGoodsPageVo);
         }
+        wmsInventoryCheckbillGoodsPageVoPagerVo.setRecords(records);
         return rb.success().setData(wmsInventoryCheckbillGoodsPageVoPagerVo);
     }
 
@@ -95,4 +122,37 @@ public class WmsInventoryCheckbillService {
     public ResultBean<HandleBean> scan(String sid, String content, String houseSid) {
         return wmsInventoryCheckbillFeign.scan(sid, content, houseSid);
     }
+
+    public ResultBean saveInventoryInfo2(WmsInventoryCheckbillGoodsPyDto dto) {
+        return wmsInventoryCheckbillFeign.saveInventoryInfo2(dto);
+    }
+
+    public ResultBean<List<AppInventoryCheckbill>> selectGoods(String name,String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AppInventoryCheckbill> appInventoryCheckbills = new ArrayList<>();
+        List<GoodsDeptVo> goodsDeptVos = baseGoodsSkuFeign.selectGoods(name, orgPath).getData();
+        for (GoodsDeptVo goodsDeptVo : goodsDeptVos) {
+            AppInventoryCheckbill appInventoryCheckbill = new AppInventoryCheckbill();
+            appInventoryCheckbill.setDictValue(goodsDeptVo.getGoodsName());
+            Extra extra = new Extra();
+            extra.setGoodsSkuCode(goodsDeptVo.getGoodsSkuCode());
+            extra.setUnit(goodsDeptVo.getUnit());
+            appInventoryCheckbill.setExtra(extra);
+            appInventoryCheckbills.add(appInventoryCheckbill);
+        }
+        return rb.success().setData(appInventoryCheckbills);
+    }
+
+    public ResultBean<List<AppInventoryCheckbill>> selectProvider(String name,String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AppInventoryCheckbill> appInventoryCheckbills = new ArrayList<>();
+        List<BaseSupplierInfoChoice> baseSupplierInfoChoices = baseSupplierInfoFeign.selectProvider(name, orgPath).getData();
+        for (BaseSupplierInfoChoice baseSupplierInfoChoice : baseSupplierInfoChoices) {
+            AppInventoryCheckbill appInventoryCheckbill = new AppInventoryCheckbill();
+            appInventoryCheckbill.setId(baseSupplierInfoChoice.getSid());
+            appInventoryCheckbill.setDictValue(baseSupplierInfoChoice.getSupplierName());
+            appInventoryCheckbills.add(appInventoryCheckbill);
+        }
+        return rb.success().setData(appInventoryCheckbills);
+    }
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/BaseGoodsSkuFeign.java

@@ -0,0 +1,27 @@
+package com.yxt.anrui.terminal.fegin.basegoodssku;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/20
+ **/
+@FeignClient(
+        contextId = "yxt-base-BaseGoodsSku",
+        name = "yxt-base",
+        path = "/apiadmin/base/basegoodssku")
+public interface BaseGoodsSkuFeign {
+
+    @ApiOperation("移动端-查询本部门下的商品信息")
+    @GetMapping("/selectGoods")
+    @ResponseBody
+    public ResultBean<List<GoodsDeptVo>> selectGoods(@RequestParam(value = "name",required = false) String name, @RequestParam("orgPath") String orgPath);
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.fegin.basegoodssku;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/17
+ **/
+@Data
+public class GoodsDeptVo {
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoChoice.java

@@ -0,0 +1,54 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.fegin.basesupplierinfo;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: yxt-base(供应商管理) <br/>
+ * File: BaseSupplierInfoVo.java <br/>
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo <br/>
+ * Description: 供应商信息 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2024-03-18 13:33:13 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象")
+public class BaseSupplierInfoChoice implements Vo {
+
+    private String sid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoFeign.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.terminal.fegin.basesupplierinfo;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/3/26 17:12
+ */
+@FeignClient(
+        contextId = "yxt-base-BaseSupplierInfo",
+        name = "yxt-base",
+        path = "v1/basesupplierinfo")
+public interface BaseSupplierInfoFeign {
+
+    @ApiOperation("移动端-查询本部门下供应商信息")
+    @GetMapping("/selectProvider")
+    @ResponseBody
+    public ResultBean<List<BaseSupplierInfoChoice>> selectProvider(@RequestParam(value = "name",required = false) String name, @RequestParam("orgPath") String orgPath);
+}

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

@@ -59,5 +59,5 @@ public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query {
     @ApiModelProperty("图号")
     private String goodsSkuCode; // 图号
 
-    private String names;
+    private String name;
 }

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

@@ -1,9 +1,6 @@
 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.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;
@@ -28,7 +25,6 @@ public interface WmsInventoryCheckbillFeign {
     @PostMapping("/appDetailRackPageList")
     public ResultBean<PagerVo<WmsInventoryCheckbillPageVo>> appDetailRackPageList(@RequestBody PagerQuery<WmsInventoryCheckbillPageQuery> pq);
 
-
     @ApiOperation("查看库位商品盘点列表")
     @PostMapping("/detailRackGoodPageList")
     public ResultBean<PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo>> detailRackGoodPageList(@RequestBody PagerQuery<WmsInventoryCheckbillDetailRackGoodPageListQuery> pq);
@@ -38,6 +34,11 @@ public interface WmsInventoryCheckbillFeign {
     @ResponseBody
     ResultBean saveInventoryInfo(@RequestBody WmsInventoryCheckbillGoodsDto dto);
 
+    @ApiOperation("盘盈保存")
+    @PostMapping("/saveInventoryInfo2")
+    @ResponseBody
+    ResultBean saveInventoryInfo2(@RequestBody WmsInventoryCheckbillGoodsPyDto dto);
+
     @ApiOperation("扫描商品码")
     @GetMapping("/scan")
     @ResponseBody

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java

@@ -78,4 +78,13 @@ public class BaseGoodsSkuRest {
         PagerVo<GoodsSkuVo> pv = baseGoodsSkuService.getGoodsListPage(pagerQuery);
         return rb.success().setData(pv);
     }
+
+    @ApiOperation("移动端-查询本部门下的商品信息")
+    @GetMapping("/selectGoods")
+    @ResponseBody
+    public ResultBean<List<GoodsDeptVo>> selectGoods(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath){
+        ResultBean rb = ResultBean.fireFail();
+        List<GoodsDeptVo> goodsDeptVos = baseGoodsSkuService.selectGoods(name,orgPath);
+        return rb.success().setData(goodsDeptVos);
+    }
 }

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java

@@ -94,4 +94,13 @@ public class BaseSupplierInfoRest {
 		List<BaseSupplierInfoChoice> baseSupplierInfoChoiceList = baseSupplierInfoService.choiceSupplierInfo(createOrgSid);
 		return rb.success().setData(baseSupplierInfoChoiceList);
 	}
+
+	@ApiOperation("移动端-查询本部门下供应商信息")
+	@GetMapping("/selectProvider")
+	@ResponseBody
+	public ResultBean<List<BaseSupplierInfoChoice>> selectProvider(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath){
+		ResultBean rb = ResultBean.fireFail();
+		List<BaseSupplierInfoChoice> baseSupplierInfoChoiceList = baseSupplierInfoService.selectProvider(name,orgPath);
+		return rb.success().setData(baseSupplierInfoChoiceList);
+	};
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java

@@ -27,4 +27,6 @@ public interface BaseGoodsSkuMapper extends BaseMapper<BaseGoodsSku> {
     IPage<BaseGoodsSkuPurSelectList> purGoodsListPage(IPage<BaseGoodsSku> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsSku> qw);
 
     IPage<GoodsSkuVo> getGoodsListPage(IPage<BaseGoodsSku> page, @Param(Constants.WRAPPER) QueryWrapper<BaseGoodsSku> qw);
+
+    List<GoodsDeptVo> selectGoods(@Param("name") String name, @Param("useOrgSid") String useOrgSid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml

@@ -74,4 +74,19 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <select id="selectGoods" resultType="com.yxt.base.biz.base.basegoodssku.GoodsDeptVo">
+        select sku.title AS goodsName,
+               sku.goodsSkuCode,
+               spu.goodsUnitName AS unit
+        from base_goods_sku sku
+                     left join base_goods_spu spu on spu.sid = sku.goodsSpuSid
+        where spu.useOrgSid = #{useOrgSid}
+        <if test="name != null and name != ''">
+            and concat(IFNULL(sku.title
+            , '')) LIKE concat('%'
+            , #{name}
+            , '%')
+        </if>
+    </select>
 </mapper>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java

@@ -9,6 +9,8 @@ import com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpu;
 import com.yxt.base.biz.base.basegoodsspu.BaseGoodsSpuService;
 import com.yxt.base.biz.base.basegoodstype.BaseGoodsType;
 import com.yxt.base.biz.base.basegoodstype.BaseGoodsTypeService;
+import com.yxt.base.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.base.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.base.feign.wms.wmsinventory.WmsGoodsInventoryVo;
 import com.yxt.base.feign.wms.wmsinventory.WmsInventoryFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -25,6 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -47,6 +50,8 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
     BaseGoodsTypeService baseGoodsTypeService;
     @Autowired
     private WmsInventoryFeign wmsInventoryFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public BaseGoodsSku getOneBySpuSid(String spuSid) {
         return baseMapper.selectOne(new QueryWrapper<BaseGoodsSku>().eq("goodsSpuSid", spuSid));
@@ -243,4 +248,20 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         PagerVo<GoodsSkuVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public List<GoodsDeptVo> selectGoods(String name, String orgPath) {
+        String useOrgSid = "";
+        if (StringUtils.isNotBlank(orgPath)) {
+            List<String> split = Arrays.asList(orgPath.split("/"));
+            if (split.size() > 1) {
+                //获取本级sid获取本级部门信息
+                SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+                useOrgSid = sysOrganization1.getSid();
+            } else {
+                SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+                useOrgSid = sysOrganization.getSid();
+            }
+        }
+        return baseMapper.selectGoods(name,useOrgSid);
+    }
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsDeptVo.java

@@ -0,0 +1,20 @@
+package com.yxt.base.biz.base.basegoodssku;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/4/17
+ **/
+@Data
+public class GoodsDeptVo {
+
+    @ApiModelProperty("商品名称")
+    private String goodsName;
+    @ApiModelProperty("单位")
+    private String unit;
+    @ApiModelProperty("图号")
+    private String goodsSkuCode;
+}

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java

@@ -70,4 +70,6 @@ public interface BaseSupplierInfoMapper extends BaseMapper<BaseSupplierInfo> {
 
 	@Select("select count(*) from base_supplier_info where supplierCode = #{supplierCode} and useOrgSid = #{useOrgSid} and isDelete = '0' and sid != #{dtoSid}")
 	int checkSidByCodeAndUseOrgSid(@Param("supplierCode") String supplierCode,@Param("useOrgSid") String useOrgSid,@Param("dtoSid") String dtoSid);
+
+    List<BaseSupplierInfoChoice> selectProvider(@Param("name") String name,@Param("useOrgSid") String useOrgSid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml

@@ -10,4 +10,18 @@
 	<select id="selectListAllVo" resultType="com.yxt.base.biz.base.basesupplierinfo.BaseSupplierInfoVo">
 		SELECT * FROM base_supplier_info <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="selectProvider" resultType="com.yxt.base.biz.base.basesupplierinfo.BaseSupplierInfoChoice">
+		select sid,supplierName
+		from
+		base_supplier_info
+		where useOrgSid = #{useOrgSid}
+		and isDelete = 0
+		<if test="name != null and name != ''">
+			and concat(IFNULL(supplierName
+			, '')) LIKE concat('%'
+			, #{name}
+			, '%')
+		</if>
+    </select>
 </mapper>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java

@@ -191,4 +191,20 @@ public class BaseSupplierInfoService extends MybatisBaseService<BaseSupplierInfo
 		List<BaseSupplierInfoChoice> baseSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid);
 		return baseSupplierInfoChoiceList;
 	}
+
+	public List<BaseSupplierInfoChoice> selectProvider(String name, String orgPath) {
+		String useOrgSid = "";
+		if (StringUtils.isNotBlank(orgPath)) {
+			List<String> split = Arrays.asList(orgPath.split("/"));
+			if (split.size() > 1) {
+				//获取本级sid获取本级部门信息
+				SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
+				useOrgSid = sysOrganization1.getSid();
+			} else {
+				SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
+				useOrgSid = sysOrganization.getSid();
+			}
+		}
+		return baseMapper.selectProvider(name,useOrgSid);
+	}
 }

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

@@ -32,10 +32,7 @@ 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.wmsinventorycheckbilldetail.app.*;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportDetailsVo;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
 import io.swagger.annotations.Api;
@@ -153,6 +150,13 @@ public class WmsInventoryCheckbillRest {
         return wmsInventoryCheckbillService.saveInventoryInfo(dto);
     }
 
+    @ApiOperation("盘盈保存")
+    @PostMapping("/saveInventoryInfo2")
+    @ResponseBody
+    ResultBean saveInventoryInfo2(@RequestBody WmsInventoryCheckbillGoodsPyDto dto){
+        return wmsInventoryCheckbillService.saveInventoryInfo2(dto);
+    }
+
     @ApiOperation("扫描商品码")
     @GetMapping("/scan")
     @ResponseBody

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java

@@ -35,9 +35,9 @@ import java.util.List;
 @Mapper
 public interface WmsAppendixMapper extends BaseMapper<WmsAppendix> {
 
-    @Delete("delete from as_appendix where linkSid = #{dtoSid}")
+    @Delete("delete from wms_appendix where linkSid = #{dtoSid}")
     void delByLinkSid(String dtoSid);
 
-    @Select("select * from as_appendix where linkSid = #{linkSid}")
+    @Select("select * from wms_appendix where linkSid = #{linkSid}")
     List<WmsAppendix> fetchByLinkSid(String linkSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsFileEnum.java

@@ -0,0 +1,38 @@
+package com.yxt.wms.biz.inventory.wmsappendix;
+
+/**
+ * @Author fan
+ * @Date 2022/11/14 22:46
+ * @Description
+ */
+public enum WmsFileEnum {
+
+    WMSINVENTORYCHECKBILLDETAIL("001", "盘点商品附件"),
+    ;
+
+
+    /**
+     * 附件类型
+     */
+    private final String attachType;
+
+    /**
+     * 代号
+     */
+    private final String mark;
+
+    WmsFileEnum(String attachType, String mark) {
+        this.attachType = attachType;
+        this.mark = mark;
+    }
+
+    public String getAttachType() {
+        return attachType;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+
+}

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

@@ -122,6 +122,7 @@
 	<select id="detailRackGoodPageList"
 			resultType="com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailRackGoodPageListVo">
 		SELECT
+		sid,
 		goodsID,
 		goodsSkuTitle,
 		goodsSkuCode,

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

@@ -32,21 +32,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.common.base.config.component.DocPdfComponent;
+import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.WordConvertUtils;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
 import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
 import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendix;
 import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService;
 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.wmsinventorycheckbilldetail.app.*;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*;
 import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
@@ -129,6 +128,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
     private FlowFeign flowFeign;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
 
     public PagerVo<WmsInventoryCheckbillVo> listPageVo(PagerQuery<WmsInventoryCheckbillQuery> pq) {
         WmsInventoryCheckbillQuery query = pq.getParams();
@@ -263,11 +264,22 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
             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()));
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("goodsID", query.getName()).or().like("goodsSkuTitle", query.getName()).or().like("goodsSkuCode", query.getName()));
         }
         IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
         IPage<WmsInventoryCheckbillDetailRackGoodPageListVo> pagging = baseMapper.detailRackGoodPageList(page, qw);
+        for (WmsInventoryCheckbillDetailRackGoodPageListVo record : pagging.getRecords()) {
+            List<WmsAppendix> wmsAppendices = wmsAppendixService.fetchByLinkSid(record.getSid());
+            List<WmsInventoryCheckbillDetailFile> wmsInventoryCheckbillDetailFiles = new ArrayList<>();
+            for (WmsAppendix wmsAppendix : wmsAppendices) {
+                WmsInventoryCheckbillDetailFile wmsInventoryCheckbillDetailFile = new WmsInventoryCheckbillDetailFile();
+                String url = fileUploadComponent.getUrlPrefix() + wmsAppendix.getFilePath();
+                wmsInventoryCheckbillDetailFile.setUrl(url);
+                wmsInventoryCheckbillDetailFiles.add(wmsInventoryCheckbillDetailFile);
+            }
+            record.setFileList(wmsInventoryCheckbillDetailFiles);
+        }
         PagerVo<WmsInventoryCheckbillDetailRackGoodPageListVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -815,8 +827,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
                 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()));
+        if (StringUtils.isNotBlank(query.getName())) {
+            qw.and(wrapper -> wrapper.like("d.warehouseName", query.getName()).or().like("d.warehouseArea", query.getName()).or().like("d.warehouseRackName", query.getName()));
         }
         qw.eq("c.checkState",'1');
         qw.groupBy("d.warehouseRackSid");
@@ -857,4 +869,10 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
         }
         return rb.success().setData(handleBean);
     }
+
+    public ResultBean saveInventoryInfo2(WmsInventoryCheckbillGoodsPyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        wmsInventoryCheckbillDetailService.saveInventoryInfo2(dto);
+        return rb.success();
+    }
 }

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

@@ -86,5 +86,9 @@ public class WmsInventoryCheckbillDetail extends BaseEntity {
     private BigDecimal loseCount;
     @ApiModelProperty("盘损数量")
     private BigDecimal lossCount; // 盘损数量
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 
 }

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

@@ -89,4 +89,8 @@ public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
     private BigDecimal loseCount;
     @ApiModelProperty("盘损数量")
     private BigDecimal lossCount; // 盘损数量
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 }

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

@@ -89,4 +89,8 @@ public class WmsInventoryCheckbillDetailDto implements Dto {
     private BigDecimal loseCount;
     @ApiModelProperty("盘损数量")
     private BigDecimal lossCount; // 盘损数量
+    @ApiModelProperty("供应商sid")
+    private String supplierSid;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
 }

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

@@ -62,5 +62,5 @@ public class WmsInventoryCheckbillDetailRackGoodPageListQuery implements Query {
     /*
     * 移动端查询条件
     * */
-    private String names;
+    private String name;
 }

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

@@ -26,11 +26,24 @@
 package com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.config.component.FileUploadComponent;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseArea;
+import com.yxt.wms.biz.base.wmswarehousearea.WmsWarehouseAreaService;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfo;
+import com.yxt.wms.biz.base.wmswarehouseinfo.WmsWarehouseInfoService;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRack;
+import com.yxt.wms.biz.base.wmswarehouserack.WmsWarehouseRackService;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendix;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsAppendixService;
+import com.yxt.wms.biz.inventory.wmsappendix.WmsFileEnum;
 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.WmsInventoryCheckbillGoodsPyDto;
 import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.WmsInventoryCheckbillReportSumVo;
 import com.yxt.common.base.service.MybatisBaseService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -53,6 +66,17 @@ import java.util.List;
 @Service
 public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsInventoryCheckbillDetailMapper, WmsInventoryCheckbillDetail> {
 
+    @Autowired
+    private WmsAppendixService wmsAppendixService;
+    @Autowired
+    private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private WmsWarehouseRackService wmsWarehouseRackService;
+    @Autowired
+    private WmsWarehouseAreaService wmsWarehouseAreaService;
+    @Autowired
+    private WmsWarehouseInfoService wmsWarehouseInfoService;
+
     public void insertByDto(WmsInventoryCheckbillDetailDto dto) {
         WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
@@ -98,9 +122,54 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
         } else {
             baseMapper.saveInventoryInfoZC(dto, dto.getNum());
         }
+        List<String> files = dto.getFiles();
+        wmsAppendixService.delByLinkSid(dto.getSid());
+        for (String file : files) {
+            String filePath = file.replace(fileUploadComponent.getUrlPrefix(), "");
+            WmsAppendix wmsAppendix = new WmsAppendix();
+            wmsAppendix.setLinkSid(dto.getSid());
+            wmsAppendix.setAttachType(WmsFileEnum.WMSINVENTORYCHECKBILLDETAIL.getAttachType());
+            wmsAppendix.setFilePath(filePath);
+            wmsAppendixService.save(wmsAppendix);
+        }
     }
 
     public HandleBean scan(String sid, String content, String houseSid) {
         return baseMapper.scan(sid, content, houseSid);
     }
+
+    public void saveInventoryInfo2(WmsInventoryCheckbillGoodsPyDto dto) {
+        WmsInventoryCheckbillDetail wmsInventoryCheckbillDetail = new WmsInventoryCheckbillDetail();
+        wmsInventoryCheckbillDetail.setBillSid(dto.getPanDianSid());
+        wmsInventoryCheckbillDetail.setGoodsSkuTitle(dto.getGoodsName());
+        wmsInventoryCheckbillDetail.setGoodsSkuCode(dto.getGoodsSkuCode());
+        wmsInventoryCheckbillDetail.setUnit(dto.getUnit());
+        WmsWarehouseRack wmsWarehouseRack = wmsWarehouseRackService.fetchBySid(dto.getHouseSid());
+        WmsWarehouseArea wmsWarehouseArea = wmsWarehouseAreaService.fetchBySid(wmsWarehouseRack.getLocationSid());
+        WmsWarehouseInfo wmsWarehouseInfo = wmsWarehouseInfoService.fetchBySid(wmsWarehouseArea.getWarehouseSid());
+        wmsInventoryCheckbillDetail.setWarehouseSid(wmsWarehouseInfo.getSid());
+        wmsInventoryCheckbillDetail.setWarehouseName(wmsWarehouseInfo.getWarehouseName());
+        wmsInventoryCheckbillDetail.setWarehouseAreaSid(wmsWarehouseArea.getSid());
+        wmsInventoryCheckbillDetail.setWarehouseArea(wmsWarehouseArea.getAreaName());
+        wmsInventoryCheckbillDetail.setWarehouseRackSid(wmsWarehouseRack.getSid());
+        wmsInventoryCheckbillDetail.setWarehouseRackName(wmsWarehouseRack.getRackName());
+        wmsInventoryCheckbillDetail.setSupplierSid(dto.getProviderSid());
+        wmsInventoryCheckbillDetail.setSupplierName(dto.getProvider());
+        wmsInventoryCheckbillDetail.setBookCount(new BigDecimal("0"));
+        wmsInventoryCheckbillDetail.setRealCount(new BigDecimal(dto.getNum()));
+        wmsInventoryCheckbillDetail.setLossCount(new BigDecimal(dto.getBadNum()));
+        wmsInventoryCheckbillDetail.setProfitCount(new BigDecimal(dto.getNum()));
+        wmsInventoryCheckbillDetail.setLoseCount(new BigDecimal("0"));
+        wmsInventoryCheckbillDetail.setRemarks(dto.getRemarks());
+        baseMapper.insert(wmsInventoryCheckbillDetail);
+        List<String> files = dto.getFiles();
+        for (String file : files) {
+            String filePath = file.replace(fileUploadComponent.getUrlPrefix(), "");
+            WmsAppendix wmsAppendix = new WmsAppendix();
+            wmsAppendix.setLinkSid(wmsInventoryCheckbillDetail.getSid());
+            wmsAppendix.setAttachType(WmsFileEnum.WMSINVENTORYCHECKBILLDETAIL.getAttachType());
+            wmsAppendix.setFilePath(filePath);
+            wmsAppendixService.save(wmsAppendix);
+        }
+    }
 }

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

@@ -0,0 +1,60 @@
+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 WmsInventoryCheckbillGoodsPyDto implements Dto {
+
+    /**
+     * 损坏数量
+     */
+    private String badNum;
+    /**
+     * 附件
+     */
+    private List<String> files;
+    /**
+     * 确认数量/数量
+     */
+    private String num;
+    /**
+     * 库存数量
+     */
+    private String lockNum;
+    /**
+     * 备注
+     */
+    private String remarks;
+    /**
+     * 商品名称
+     */
+    private String goodsName;
+    /**
+     * 商品sid
+     */
+    private String goodsSid;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 库位sid
+     */
+    private String houseSid;
+    /**
+     * 盘点单sid
+     */
+    private String panDianSid;
+    /**
+     * 供应商
+     */
+    private String provider;
+    private String providerSid;
+    /**
+     * 单位
+     */
+    private String unit;
+}

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

@@ -10,7 +10,7 @@ public class WmsInventoryCheckbillPageQuery implements Query {
     /**
      * 仓库/库区/库位
      */
-    private String names;
+    private String name;
     /**
      * 组织机构sid
      */

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

@@ -26,5 +26,5 @@ public class WmsInventoryCheckbillPageVo implements Vo {
     @ApiModelProperty("实盘数量")
     private String actualNumber;
     @ApiModelProperty("是否显示按钮")
-    private Boolean showBtn = false;
+    private Boolean showBtn = true;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java

@@ -14,8 +14,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 @FeignClient(
         contextId = "yxt-base-BaseSupplierInfo",
         name = "yxt-base",
-        path = "/apiadmin/base/basesupplierinfo",
-        fallback = BaseSupplierInfoFeignFallback.class)
+        path = "v1/basesupplierinfo")
 public interface BaseSupplierInfoFeign {
 
     @ApiOperation("根据SID获取供应商")

yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java

@@ -1,18 +0,0 @@
-package com.yxt.wms.feign.base.basesupplierinfo;
-
-import com.yxt.common.core.result.ResultBean;
-import org.springframework.stereotype.Component;
-
-/**
- * @author wangpengfei
- * @date 2024/3/26 17:12
- */
-@Component
-public class BaseSupplierInfoFeignFallback implements BaseSupplierInfoFeign {
-
-
-    @Override
-    public ResultBean<BaseSupplierInfoDetailsVo> fetchDetailsBySid(String sid) {
-        return null;
-    }
-}