From d11449d412d4bfb1d185294157c315d6ef45bab9 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 15 Aug 2024 10:14:10 +0800 Subject: [PATCH] 1 --- .../AppInventoryCheckbill.java | 11 +++ .../AppInventoryCheckbillFeign.java | 17 +++++ .../api/wms/inventorycheckbill/Extra.java | 10 +++ .../WmsInventoryCheckbillGoodsDto.java | 4 + .../WmsInventoryCheckbillGoodsPageQuery.java | 2 +- .../WmsInventoryCheckbillGoodsPyDto.java | 64 ++++++++++++++++ .../WmsInventoryCheckbillPageQuery.java | 2 +- .../anrui/terminal/TerminalApplication.java | 2 +- .../WmsInventoryCheckbillRest.java | 17 +++++ .../WmsInventoryCheckbillService.java | 76 +++++++++++++++++-- .../fegin/basegoodssku/BaseGoodsSkuFeign.java | 27 +++++++ .../fegin/basegoodssku/GoodsDeptVo.java | 20 +++++ .../BaseSupplierInfoChoice.java | 54 +++++++++++++ .../BaseSupplierInfoFeign.java | 26 +++++++ ...yCheckbillDetailRackGoodPageListQuery.java | 2 +- .../WmsInventoryCheckbillFeign.java | 11 +-- .../base/apiadmin/base/BaseGoodsSkuRest.java | 9 +++ .../apiadmin/base/BaseSupplierInfoRest.java | 9 +++ .../base/basegoodssku/BaseGoodsSkuMapper.java | 2 + .../base/basegoodssku/BaseGoodsSkuMapper.xml | 15 ++++ .../basegoodssku/BaseGoodsSkuService.java | 21 +++++ .../biz/base/basegoodssku/GoodsDeptVo.java | 20 +++++ .../BaseSupplierInfoMapper.java | 2 + .../BaseSupplierInfoMapper.xml | 14 ++++ .../BaseSupplierInfoService.java | 16 ++++ .../inventroy/WmsInventoryCheckbillRest.java | 12 ++- .../wmsappendix/WmsAppendixMapper.java | 4 +- .../inventory/wmsappendix/WmsFileEnum.java | 38 ++++++++++ .../WmsInventoryCheckbillMapper.xml | 1 + .../WmsInventoryCheckbillService.java | 34 +++++++-- .../WmsInventoryCheckbillDetail.java | 4 + .../WmsInventoryCheckbillDetailDetailsVo.java | 4 + .../WmsInventoryCheckbillDetailDto.java | 4 + ...yCheckbillDetailRackGoodPageListQuery.java | 2 +- .../WmsInventoryCheckbillDetailService.java | 69 +++++++++++++++++ .../app/WmsInventoryCheckbillGoodsPyDto.java | 60 +++++++++++++++ .../app/WmsInventoryCheckbillPageQuery.java | 2 +- .../app/WmsInventoryCheckbillPageVo.java | 2 +- .../BaseSupplierInfoFeign.java | 3 +- .../BaseSupplierInfoFeignFallback.java | 18 ----- 40 files changed, 656 insertions(+), 54 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbill.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/BaseGoodsSkuFeign.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoChoice.java create mode 100644 anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoFeign.java create mode 100644 yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsDeptVo.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsFileEnum.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbilldetail/app/WmsInventoryCheckbillGoodsPyDto.java delete mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbill.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbill.java new file mode 100644 index 0000000000..6bd4e5c34d --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java index 6b33162280..320bd702e2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/AppInventoryCheckbillFeign.java +++ b/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 scan(@RequestParam("sid") String sid,@RequestParam("content") String content,@RequestParam("houseSid") String houseSid); + + @ApiOperation("检索商品") + @GetMapping("/selectGoods") + @ResponseBody + public ResultBean> selectGoods(@RequestParam(value = "name",required = false) String name, @RequestParam("orgPath") String orgPath); + + @ApiOperation("检索供应商") + @GetMapping("/selectProvider") + @ResponseBody + public ResultBean> selectProvider(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/Extra.java new file mode 100644 index 0000000000..d6fab77255 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java index 1bd3ab7440..3f173a3c35 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsDto.java +++ b/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; /** * 备注 */ diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java index 897a5cb305..1660df3652 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPageQuery.java +++ b/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; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillGoodsPyDto.java new file mode 100644 index 0000000000..974b48aba2 --- /dev/null +++ b/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 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; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java index 00fa416c62..89d515ab02 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/wms/inventorycheckbill/WmsInventoryCheckbillPageQuery.java +++ b/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 */ diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java index 6078fa1de9..2b6f547442 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java @@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.terminal", "com.yxt.common.base.config" },exclude = {DataSourceAutoConfiguration.class}) -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin","com.yxt.anrui.terminal.fegin.wmsInventoryCheckbill"}) +@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) { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java index ba950c53ab..4d2a999cca 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillRest.java @@ -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 scan(String sid, String content, String houseSid) { return wmsInventoryCheckbillService.scan(sid, content, houseSid); } + + @Override + public ResultBean> selectGoods(String name, String orgPath) { + return wmsInventoryCheckbillService.selectGoods(name, orgPath); + } + + @Override + public ResultBean> selectProvider(String name, String orgPath) { + return wmsInventoryCheckbillService.selectProvider(name, orgPath); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java index 47f4f44dc1..a2421c35b9 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/wms/inventorycheckbill/WmsInventoryCheckbillService.java @@ -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> pdlist(PagerQuery 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 data = wmsInventoryCheckbillFeign.detailRackGoodPageList(query).getData(); + Iterator iterator = data.getRecords().iterator(); PagerVo wmsInventoryCheckbillGoodsPageVoPagerVo = new PagerVo<>(); - for (WmsInventoryCheckbillDetailRackGoodPageListVo record : data.getRecords()) { + List 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 fileList = record.getFileList(); List 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 scan(String sid, String content, String houseSid) { return wmsInventoryCheckbillFeign.scan(sid, content, houseSid); } + + public ResultBean saveInventoryInfo2(WmsInventoryCheckbillGoodsPyDto dto) { + return wmsInventoryCheckbillFeign.saveInventoryInfo2(dto); + } + + public ResultBean> selectGoods(String name,String orgPath) { + ResultBean rb = ResultBean.fireFail(); + List appInventoryCheckbills = new ArrayList<>(); + List 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> selectProvider(String name,String orgPath) { + ResultBean rb = ResultBean.fireFail(); + List appInventoryCheckbills = new ArrayList<>(); + List 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); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/BaseGoodsSkuFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/BaseGoodsSkuFeign.java new file mode 100644 index 0000000000..dbbea3475f --- /dev/null +++ b/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> selectGoods(@RequestParam(value = "name",required = false) String name, @RequestParam("orgPath") String orgPath); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basegoodssku/GoodsDeptVo.java new file mode 100644 index 0000000000..f6ab211c17 --- /dev/null +++ b/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; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoChoice.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoChoice.java new file mode 100644 index 0000000000..782bb49779 --- /dev/null +++ b/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(供应商管理)
+ * File: BaseSupplierInfoVo.java
+ * Class: com.yxt.base.api.basesupplierinfo.BaseSupplierInfoVo
+ * Description: 供应商信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-18 13:33:13
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "供应商信息 视图数据对象", description = "供应商信息 视图数据对象") +public class BaseSupplierInfoChoice implements Vo { + + private String sid; + @ApiModelProperty("供应商名称") + private String supplierName; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/basesupplierinfo/BaseSupplierInfoFeign.java new file mode 100644 index 0000000000..c702e19724 --- /dev/null +++ b/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> selectProvider(@RequestParam(value = "name",required = false) String name, @RequestParam("orgPath") String orgPath); +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java index 0b3ef73f9b..6bae8c69e6 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillDetailRackGoodPageListQuery.java +++ b/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; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java index f7f660a384..5a4824a23b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsInventoryCheckbill/WmsInventoryCheckbillFeign.java +++ b/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> appDetailRackPageList(@RequestBody PagerQuery pq); - @ApiOperation("查看库位商品盘点列表") @PostMapping("/detailRackGoodPageList") public ResultBean> detailRackGoodPageList(@RequestBody PagerQuery 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 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java index 40d04bd821..6f29888fb9 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSkuRest.java @@ -78,4 +78,13 @@ public class BaseGoodsSkuRest { PagerVo pv = baseGoodsSkuService.getGoodsListPage(pagerQuery); return rb.success().setData(pv); } + + @ApiOperation("移动端-查询本部门下的商品信息") + @GetMapping("/selectGoods") + @ResponseBody + public ResultBean> selectGoods(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List goodsDeptVos = baseGoodsSkuService.selectGoods(name,orgPath); + return rb.success().setData(goodsDeptVos); + } } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java index 76ec333b69..8d796aa343 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java @@ -94,4 +94,13 @@ public class BaseSupplierInfoRest { List baseSupplierInfoChoiceList = baseSupplierInfoService.choiceSupplierInfo(createOrgSid); return rb.success().setData(baseSupplierInfoChoiceList); } + + @ApiOperation("移动端-查询本部门下供应商信息") + @GetMapping("/selectProvider") + @ResponseBody + public ResultBean> selectProvider(@RequestParam(value = "name",required = false) String name,@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List baseSupplierInfoChoiceList = baseSupplierInfoService.selectProvider(name,orgPath); + return rb.success().setData(baseSupplierInfoChoiceList); + }; } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java index b9a042c9be..cc533a2244 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.java @@ -27,4 +27,6 @@ public interface BaseGoodsSkuMapper extends BaseMapper { IPage purGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage getGoodsListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List selectGoods(@Param("name") String name, @Param("useOrgSid") String useOrgSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml index 95fccc0688..63d0d82a26 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuMapper.xml @@ -74,4 +74,19 @@ ${ew.sqlSegment} + + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java index a11d268b14..20da8960e0 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java +++ b/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().eq("goodsSpuSid", spuSid)); @@ -243,4 +248,20 @@ public class BaseGoodsSkuService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public List selectGoods(String name, String orgPath) { + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List 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); + } } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsDeptVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/GoodsDeptVo.java new file mode 100644 index 0000000000..c08ec01269 --- /dev/null +++ b/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; +} diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java index 072ba612cc..4be08bbd32 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.java @@ -70,4 +70,6 @@ public interface BaseSupplierInfoMapper extends BaseMapper { @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 selectProvider(@Param("name") String name,@Param("useOrgSid") String useOrgSid); } \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml index 22a048d4a4..cad6431817 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoMapper.xml @@ -10,4 +10,18 @@ + + \ No newline at end of file diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java index 14270dbb75..5a18edb28d 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoService.java @@ -191,4 +191,20 @@ public class BaseSupplierInfoService extends MybatisBaseService baseSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid); return baseSupplierInfoChoiceList; } + + public List selectProvider(String name, String orgPath) { + String useOrgSid = ""; + if (StringUtils.isNotBlank(orgPath)) { + List 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); + } } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java index c2d55ac94d..09c7725907 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryCheckbillRest.java +++ b/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 diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java index 4dc897c82e..a65715d088 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsAppendixMapper.java +++ b/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 { - @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 fetchByLinkSid(String linkSid); } \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsFileEnum.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsappendix/WmsFileEnum.java new file mode 100644 index 0000000000..9d2aab9b8d --- /dev/null +++ b/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; + } + + +} diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml index 1936873004..73be135214 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml @@ -122,6 +122,7 @@