From 794977c426b069bbf6ed0a6a2b9f30d7b8c36533 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Mon, 19 Aug 2024 09:16:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aggregation/WarehouseInventoryRest.java | 9 +- .../aggregation/WarehouseInvoiceOutRest.java | 24 ++++ .../aggregation/WarehouseInvoiceRest.java | 37 ++++++ .../WarehouseOutBillDetailRest.java | 33 +++++ .../aggregation/WarehouseOutBillRest.java | 41 +++++- .../aggregation/WarehouseOutLocationRest.java | 37 ++++++ .../supplierinfo/SupplierInfoService.java | 1 - .../biz/func/sysuserrole/SysUserRoleDto.java | 2 +- .../warehouseinventory/AvailableCountVo.java | 25 ++++ .../WarehouseInventoryService.java | 3 + .../warehouseinvoice/WarehouseInvoice.java | 33 +++++ .../warehouseinvoice/WarehouseInvoiceDto.java | 39 ++++++ .../WarehouseInvoiceMapper.java | 22 ++++ .../WarehouseInvoiceMapper.xml | 5 + .../WarehouseInvoiceQuery.java | 49 +++++++ .../WarehouseInvoiceService.java | 36 +++++ .../warehouseinvoice/WarehouseInvoiceVo.java | 42 ++++++ .../WarehouseInvoiceOut.java | 35 +++++ .../WarehouseInvoiceOutDto.java | 35 +++++ .../WarehouseInvoiceOutMapper.java | 24 ++++ .../WarehouseInvoiceOutMapper.xml | 6 + .../WarehouseInvoiceOutQuery.java | 49 +++++++ .../WarehouseInvoiceOutService.java | 21 +++ .../WarehouseInvoiceOutVo.java | 34 +++++ .../warehouseoutbill/WarehouseOutBill.java | 99 +++++++++++--- .../WarehouseOutBillDetailsVo.java | 103 ++++++++++++--- .../warehouseoutbill/WarehouseOutBillDto.java | 106 ++++++++++++--- .../WarehouseOutBillGoodsQuery.java | 31 +++++ .../WarehouseOutBillInventoryVo.java | 123 +++++++++++++----- .../WarehouseOutBillQuery.java | 41 ++++-- .../WarehouseOutBillService.java | 82 ++++++++---- .../warehouseoutbill/WarehouseOutBillVo.java | 94 +++++++++++-- .../WarehouseOutStateQuery.java | 15 +++ .../WarehouseOutBillDetail.java | 42 +++--- .../WarehouseOutBillDetailDto.java | 52 +++++--- .../WarehouseOutBillDetailMapper.java | 2 - .../WarehouseOutBillDetailMapper.xml | 16 --- .../WarehouseOutBillDetailQuery.java | 13 ++ .../WarehouseOutBillDetailService.java | 21 +-- .../WarehouseOutBillDetailVo.java | 59 +++++++++ .../WarehouseOutLocation.java | 35 +++++ .../WarehouseOutLocationDto.java | 39 ++++++ .../WarehouseOutLocationMapper.java | 18 +++ .../WarehouseOutLocationMapper.xml | 6 + .../WarehouseOutLocationQuery.java | 49 +++++++ .../WarehouseOutLocationService.java | 35 +++++ .../WarehouseOutLocationVo.java | 35 +++++ .../BaseSupplierInfoFeign.java | 46 ------- .../BaseSupplierInfoFeignFallback.java | 44 ------- .../WarehouseInvoiceFeign.java | 44 +++++++ .../WarehouseInvoiceFeignFallback.java | 40 ++++++ .../WarehouseInvoiceOutFeign.java | 37 ++++++ .../WarehouseInvoiceOutFeignFallback.java | 28 ++++ .../WarehouseOutLocationFeign.java | 45 +++++++ .../WarehouseOutLocationFeignFallback.java | 40 ++++++ .../WarehouseInventoryFeign.java | 9 +- .../WarehouseInventoryFeignFallback.java | 8 ++ .../WarehouseOutBillFeign.java | 23 +++- .../WarehouseOutBillFeignFallback.java | 34 ++++- .../WarehouseOutBillDetailFeign.java | 39 ++++++ .../WarehouseOutBillDetailFeignFallback.java | 32 +++++ 61 files changed, 1929 insertions(+), 298 deletions(-) create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceOutRest.java create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceRest.java create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillDetailRest.java create mode 100644 wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutLocationRest.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/AvailableCountVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoice.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceDto.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOut.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutDto.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillGoodsQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutStateQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailVo.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocation.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationDto.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.xml create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationQuery.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationService.java create mode 100644 wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationVo.java delete mode 100644 wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java delete mode 100644 wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeignFallback.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeignFallback.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeignFallback.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeign.java create mode 100644 wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeignFallback.java diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java index 83f5727..38daa4c 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInventoryRest.java @@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * @author wangpengfei @@ -111,5 +112,11 @@ public class WarehouseInventoryRest { ResultBean fetchEntityBySid(@RequestParam("sid") String sid) { return warehouseInventoryService.fetchEntityBySid(sid); } - + @ApiOperation("根据skuSid查询商品可用库存") + @GetMapping("/selAvailableBySkuSid") + public ResultBean> selAvailableBySkuSid(@RequestParam("skuSid") String skuSid, + @RequestParam("sourceBillSid") String sourceBillSid, + @RequestParam("orgSid") String orgSid) { + return warehouseInventoryService.selAvailableBySkuSid(skuSid,sourceBillSid,orgSid); + } } diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceOutRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceOutRest.java new file mode 100644 index 0000000..5b6033b --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceOutRest.java @@ -0,0 +1,24 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutDto; +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutService; +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/8/14 14:56 + */ + +@Api(tags = "发票和出库单关联表") +@RestController +@RequestMapping("/apiadmin/warehouseinvoiceout") +public class WarehouseInvoiceOutRest { + +} diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceRest.java new file mode 100644 index 0000000..749d198 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseInvoiceRest.java @@ -0,0 +1,37 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceDto; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceService; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2024/8/14 14:55 + */ +@Api(tags = "发票信息") +@RestController +@RequestMapping("/apiadmin/warehouseinvoice") +public class WarehouseInvoiceRest { + @Autowired + private WarehouseInvoiceService warehouseInvoiceService; + + + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@RequestBody WarehouseInvoiceDto dto) { + return warehouseInvoiceService.saveOrUpdate(dto); + } + + @ApiOperation("详情") + @GetMapping("/details") + ResultBean details(@RequestParam("sid") String sid) { + return warehouseInvoiceService.details(sid); + } + +} diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillDetailRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillDetailRest.java new file mode 100644 index 0000000..84d8def --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillDetailRest.java @@ -0,0 +1,33 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailService; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/6/7 13:51 + */ +@Api(tags = "出库单据明细") +@RestController +@RequestMapping("/apiadmin/warehouseoutbilldetail") +public class WarehouseOutBillDetailRest { + @Autowired + WarehouseOutBillDetailService warehouseOutBillDetailService; + + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/selectDetailsByBillSid") + public ResultBean> selectDetailsByBillSid(@RequestParam("sid") String sid){ + return warehouseOutBillDetailService.selectDetailsByBillSid(sid); + } + +} diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java index 0a212bf..a093f62 100644 --- a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutBillRest.java @@ -1,9 +1,10 @@ -package com.yxt.Warehouse.apiadmin.aggregation; +package com.yxt.wms.apiadmin.aggregation; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.warehouseoutbill.*; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -11,8 +12,8 @@ import org.springframework.web.bind.annotation.*; /** * @description: - * @author: dimengzhe - * @date: 2024/4/24 + * @author: wangpengfei + * @date: 2024/8/12 **/ @Api(tags = "出库单据") @RestController @@ -39,16 +40,46 @@ public class WarehouseOutBillRest { ResultBean details(@RequestParam("sid") String sid) { return warehouseOutBillService.details(sid); } - + @ApiOperation("收件地址") + @GetMapping("/getAddresseeBySid") + ResultBean getAddresseeBySid(@RequestParam("sid") String sid) { + return warehouseOutBillService.getAddresseeBySid(sid); + } @ApiOperation("选择商品分页列表") @PostMapping("/getInventoryList") - ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery) { + ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery) { return warehouseOutBillService.getInventoryList(pagerQuery); } + @ApiOperation("修改承运商") + @PostMapping("/updateCarrier") + public ResultBean updateCarrier(WarehouseOutBillDto dto) { + return warehouseOutBillService.updateCarrier(dto); + } + @ApiOperation("修改运单号") + @PostMapping("/updateWaybillNumber") + public ResultBean updateWaybillNumber(WarehouseOutBillDto dto) { + return warehouseOutBillService.updateWaybillNumber(dto); + } + @ApiOperation("待分配-->打到零拣") + @PostMapping("/toBePickOut") + ResultBean toBePickOut(@RequestBody WarehouseOutStateQuery query) { + return warehouseOutBillService.toBePickOut(query); + } + @ApiOperation("零拣打单 --> 待出库") + @PostMapping("/toBeOutbound") + ResultBean toBeOutbound(@RequestBody WarehouseOutStateQuery query) { + return warehouseOutBillService.toBeOutbound(query); + } + @ApiOperation("零拣打单--->待分配") + @PostMapping("/toBeAllocated") + ResultBean toBeAllocated(@RequestBody WarehouseOutStateQuery query) { + return warehouseOutBillService.toBeAllocated(query); + } @ApiOperation("确认") @PostMapping("/confirm") ResultBean confirm(@RequestBody WarehouseOutBillDto dto) { return warehouseOutBillService.confirm(dto); } + } diff --git a/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutLocationRest.java b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutLocationRest.java new file mode 100644 index 0000000..09f53f8 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseOutLocationRest.java @@ -0,0 +1,37 @@ +package com.yxt.wms.apiadmin.aggregation; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationDto; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationService; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/8/15 10:09 + */ +@Api(tags = "出库库位分配") +@RestController +@RequestMapping("/apiadmin/warehouseoutlocation") +public class WarehouseOutLocationRest { + + @Autowired + WarehouseOutLocationService warehouseOutLocationService; + + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + ResultBean save(@RequestBody List dtos) { + return warehouseOutLocationService.save(dtos); + } + + @ApiOperation("详情") + @GetMapping("/details") + ResultBean> details(@RequestParam("sid") String sid) { + return warehouseOutLocationService.details(sid); + } +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java index 8d4902d..a60c87e 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/supplierinfo/SupplierInfoService.java @@ -33,7 +33,6 @@ import com.yxt.wms.biz.func.basegoodstype.BaseGoodsTypeQuery; import com.yxt.wms.biz.func.commonmethod.CommonMethod; import com.yxt.wms.biz.func.commonmethod.DataRule; import com.yxt.wms.biz.func.warehouseansbill.WarehouseAnsDetailsVo; -import com.yxt.wms.feign.base.basesupplierinfo.BaseSupplierInfoFeign; import com.yxt.wms.feign.supplier.supplierinfo.SupplierInfoFeign; import com.yxt.wms.feign.warehouse.warehouseansbill.WarehouseAnsBillFeign; import org.springframework.beans.factory.annotation.Autowired; diff --git a/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java b/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java index e00f12f..eb00d75 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/sysuserrole/SysUserRoleDto.java @@ -23,7 +23,7 @@ import lombok.Data; @Data public class SysUserRoleDto implements Dto { - + private String sid; @ApiModelProperty("用户sid") private String userSid; diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/AvailableCountVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/AvailableCountVo.java new file mode 100644 index 0000000..4b7fb6d --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/AvailableCountVo.java @@ -0,0 +1,25 @@ +package com.yxt.wms.biz.func.warehouseinventory; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author wangpengfei + * @date 2024/8/15 11:23 + */ +@Data +public class AvailableCountVo { + private String sid; + private String locationSid;//分配明细sid + private String goodsSkuSid; + private String goodsSpuName; + private String warehouseName; + private String areaName; + private String rackSid; + private String rackName; + private String rackCode; + private BigDecimal useCount; + private BigDecimal initialCount=new BigDecimal(0);//原分配数 + private BigDecimal count=new BigDecimal(0);//分配数 +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java index 6ed5713..f0ffd17 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinventory/WarehouseInventoryService.java @@ -323,4 +323,7 @@ public class WarehouseInventoryService extends MybatisBaseService> handleGoodsListPage(PagerQuery pq) { return warehouseInventoryFeign.handleGoodsListPage(pq); } + public ResultBean> selAvailableBySkuSid(String skuSid,String sourceBillSid,String orgSid) { + return warehouseInventoryFeign.selAvailableBySkuSid(skuSid,sourceBillSid,orgSid); + } } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoice.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoice.java new file mode 100644 index 0000000..e866bbd --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoice.java @@ -0,0 +1,33 @@ +package com.yxt.wms.biz.func.warehouseinvoice; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoice extends BaseEntity { + + + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("发票类型 1 普通发票") + private String invoiceType; + + @ApiModelProperty("开票方") + private String invoicingParty; + @ApiModelProperty("抬头") + private String rise; + @ApiModelProperty("总金额") + private String totalAmount; + @ApiModelProperty("税号") + private String dutyParagraph; + @ApiModelProperty("内容类型 1 发票商品 2自定义明细") + private String contentType; + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceDto.java new file mode 100644 index 0000000..be3e314 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceDto.java @@ -0,0 +1,39 @@ +package com.yxt.wms.biz.func.warehouseinvoice; + +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceDto { + private String sid; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("发票类型 1 普通发票") + private String invoiceType; + + @ApiModelProperty("开票方") + private String invoicingParty; + @ApiModelProperty("抬头") + private String rise; + @ApiModelProperty("总金额") + private String totalAmount; + @ApiModelProperty("税号") + private String dutyParagraph; + @ApiModelProperty("内容类型 1 发票商品 2自定义明细") + private String contentType; + private String remarks; + + + private List detailsList = new ArrayList<>(); + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.java new file mode 100644 index 0000000..8f324ae --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.java @@ -0,0 +1,22 @@ +package com.yxt.wms.biz.func.warehouseinvoice; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseInvoiceMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + WarehouseInvoiceVo details(@Param("sid") String sid); + +} + diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.xml new file mode 100644 index 0000000..c64fe3d --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceQuery.java new file mode 100644 index 0000000..ab43984 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceQuery.java @@ -0,0 +1,49 @@ +package com.yxt.wms.biz.func.warehouseinvoice; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceQuery implements Query { + + @ApiModelProperty("单据编号") + private String billNo; + private String billState; + @ApiModelProperty("外部单号") + private String externalOrderNumber; + @ApiModelProperty("线上单号") + private String onlineOrderNumber; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("下单日期开始时间") + private String orderTimeStart; + @ApiModelProperty("下单日期结束时间") + private String orderTimeEnd; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceService.java new file mode 100644 index 0000000..4d84a89 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceService.java @@ -0,0 +1,36 @@ +package com.yxt.wms.biz.func.warehouseinvoice; + +import cn.hutool.core.bean.BeanUtil; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutDto; +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutService; +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutVo; +import com.yxt.wms.feign.warehouse.warehouseinvoice.WarehouseInvoiceFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class WarehouseInvoiceService extends MybatisBaseService { + + @Autowired + WarehouseInvoiceFeign warehouseInvoiceFeign; + + public ResultBean saveOrUpdate(WarehouseInvoiceDto dto) { + return warehouseInvoiceFeign.saveOrUpdate(dto); + } + + public ResultBean details(String sid) { + return warehouseInvoiceFeign.details(sid); + } + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceVo.java new file mode 100644 index 0000000..e806e7a --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoice/WarehouseInvoiceVo.java @@ -0,0 +1,42 @@ +package com.yxt.wms.biz.func.warehouseinvoice; + + +import com.yxt.wms.biz.func.warehouseinvoiceout.WarehouseInvoiceOutVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceVo { + private String sid; + @ApiModelProperty("单据sid") + private String billSid; + @ApiModelProperty("发票类型 1 普通发票") + private String invoiceType; + private String invoiceTypeValue; + + @ApiModelProperty("开票方") + private String invoicingParty; + @ApiModelProperty("抬头") + private String rise; + @ApiModelProperty("总金额") + private String totalAmount; + @ApiModelProperty("税号") + private String dutyParagraph; + @ApiModelProperty("内容类型 1 发票商品 2自定义明细") + private String contentType; + private String contentTypeValue; + private String remarks; + + + private List detailsList = new ArrayList<>(); + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOut.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOut.java new file mode 100644 index 0000000..8b68f78 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOut.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehouseinvoiceout; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceOut extends BaseEntity { + + + @ApiModelProperty("发票sid") + private String invoiceSid; + @ApiModelProperty("商品skusid") + private String goodsSkuSid; + + @ApiModelProperty("商品名") + private String goodsSpuName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("单价") + private BigDecimal price; + @ApiModelProperty("数量") + private BigDecimal orderCount; + @ApiModelProperty("总金额") + private BigDecimal salesAmount; + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutDto.java new file mode 100644 index 0000000..2aa852a --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutDto.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehouseinvoiceout; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceOutDto { + + private String sid; + @ApiModelProperty("发票sid") + private String invoiceSid; + @ApiModelProperty("商品skusid") + private String goodsSkuSid; + + @ApiModelProperty("商品名") + private String goodsSpuName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("单价") + private BigDecimal price; + @ApiModelProperty("数量") + private BigDecimal orderCount; + @ApiModelProperty("总金额") + private BigDecimal salesAmount; + + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.java new file mode 100644 index 0000000..7f5d7f0 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.java @@ -0,0 +1,24 @@ +package com.yxt.wms.biz.func.warehouseinvoiceout; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseInvoiceOutMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + List detailsByInvoiceSid(@Param("sid") String sid); + +} + diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.xml new file mode 100644 index 0000000..3538182 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutQuery.java new file mode 100644 index 0000000..1a446ed --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutQuery.java @@ -0,0 +1,49 @@ +package com.yxt.wms.biz.func.warehouseinvoiceout; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceOutQuery implements Query { + + @ApiModelProperty("单据编号") + private String billNo; + private String billState; + @ApiModelProperty("外部单号") + private String externalOrderNumber; + @ApiModelProperty("线上单号") + private String onlineOrderNumber; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("下单日期开始时间") + private String orderTimeStart; + @ApiModelProperty("下单日期结束时间") + private String orderTimeEnd; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutService.java new file mode 100644 index 0000000..de6eb57 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutService.java @@ -0,0 +1,21 @@ +package com.yxt.wms.biz.func.warehouseinvoiceout; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class WarehouseInvoiceOutService extends MybatisBaseService { + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutVo.java new file mode 100644 index 0000000..1660e23 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseinvoiceout/WarehouseInvoiceOutVo.java @@ -0,0 +1,34 @@ +package com.yxt.wms.biz.func.warehouseinvoiceout; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseInvoiceOutVo { + + private String sid; + @ApiModelProperty("发票sid") + private String invoiceSid; + @ApiModelProperty("商品skusid") + private String goodsSkuSid; + + @ApiModelProperty("商品名") + private String goodsSpuName; + @ApiModelProperty("单位") + private String unit; + @ApiModelProperty("单价") + private BigDecimal price; + @ApiModelProperty("数量") + private BigDecimal orderCount; + @ApiModelProperty("总金额") + private BigDecimal salesAmount; + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java index a1e2750..8a0c315 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBill.java @@ -14,32 +14,93 @@ import java.util.Date; @Data public class WarehouseOutBill extends BaseEntity { + @ApiModelProperty("单据编号") private String billNo; @ApiModelProperty("来源单号") private String sourceBillNo; - @ApiModelProperty("制单人") - private String createByName; - @ApiModelProperty("业务类型key") - private String busTypeKey; - @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") - private String busTypeValue; - @ApiModelProperty("货主sid") - private String goodsOwnerSid; + @ApiModelProperty("外部状态") + private String externalState; + @ApiModelProperty("买家留言") + private String buyerMessage; + @ApiModelProperty("库存状态") + private String inventoryStatus; @ApiModelProperty("货主") - private String goodsOwner; - @ApiModelProperty("已完成/已发货") - private Integer billState; - @ApiModelProperty("是否一起发货（否0，是1）") - private Integer isTogether; - @ApiModelProperty("挂起状态（1挂起，0不挂起，2解锁）") - private Integer isHandUp; - @ApiModelProperty("优先级") - private Integer priority; - @ApiModelProperty("实际发货时间") - private Date actualDeliveTime; + private String shipper; + @ApiModelProperty("承运商") + private String carrierKey; + private String carrierValue; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("配送方式") + private String deliveryMethod; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("收货人") + private String consignee; + @ApiModelProperty("固话") + private String fixedLine; + @ApiModelProperty("邮编") + private String postalCode; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("区") + private String county; + @ApiModelProperty("街道") + private String street; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("实付") + private double actualPayment; + @ApiModelProperty("优惠") + private double discount; + @ApiModelProperty("运费") + private double freight; + @ApiModelProperty("重量") + private double weight; + @ApiModelProperty("估重") + private double weightEstimation; + @ApiModelProperty("商品数量") + private double quantity; + @ApiModelProperty("下单时间") + private Date orderTime; + @ApiModelProperty("订单号") + private String orderNumber; + @ApiModelProperty("外部订单号") + private String externalOrderNumber; + @ApiModelProperty("线上订单号") + private String onlineOrderNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("付款时间") + private Date paymentTime; + @ApiModelProperty("接单时间") + private Date orderAcceptanceTime; + @ApiModelProperty("拣选区域") + private String pickingArea; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("品牌") + private String brand; + @ApiModelProperty("波次") + private String waveTimes; + @ApiModelProperty("超时时间") + private Date timeoutPeriod; + @ApiModelProperty("到货时间") + private Date deliveryTime; + @ApiModelProperty("体积") + private double volume; + @ApiModelProperty("标记") + private String sign; + @ApiModelProperty("最晚发货时间") + private Date latestDeliveryTime; @ApiModelProperty("创建组织sid") private String createOrgSid; @ApiModelProperty("使用组织sid") private String useOrgSid; + private String remarks; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java index 80f78b0..8521b7b 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDetailsVo.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -16,22 +17,94 @@ import java.util.List; public class WarehouseOutBillDetailsVo { private String sid; - @ApiModelProperty("创建人sid") - private String createBySid; - @ApiModelProperty("制单人") - private String createByName; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("外部单号") - private String sourceBillNo; - - @ApiModelProperty("业务类型key") - private String busTypeKey; - @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") - private String busTypeValue; - @ApiModelProperty("单据状态") - private String billState; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("外部状态") + private String externalState; + @ApiModelProperty("买家留言") + private String buyerMessage; + @ApiModelProperty("库存状态") + private String inventoryStatus; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("承运商") + private String carrierKey; + private String carrierValue; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("配送方式") + private String deliveryMethod; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("收货人") + private String consignee; + @ApiModelProperty("固话") + private String fixedLine; + @ApiModelProperty("邮编") + private String postalCode; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("区") + private String county; + @ApiModelProperty("街道") + private String street; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("实付") + private double actualPayment; + @ApiModelProperty("优惠") + private double discount; + @ApiModelProperty("运费") + private double freight; + @ApiModelProperty("重量") + private double weight; + @ApiModelProperty("估重") + private double weightEstimation; + @ApiModelProperty("商品数量") + private double quantity; + @ApiModelProperty("下单时间") + private Date orderTime; + @ApiModelProperty("订单号") + private String orderNumber; + @ApiModelProperty("外部订单号") + private String externalOrderNumber; + @ApiModelProperty("线上订单号") + private String onlineOrderNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("付款时间") + private Date paymentTime; + @ApiModelProperty("接单时间") + private Date orderAcceptanceTime; + @ApiModelProperty("拣选区域") + private String pickingArea; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("品牌") + private String brand; + @ApiModelProperty("波次") + private String waveTimes; + @ApiModelProperty("超时时间") + private Date timeoutPeriod; + @ApiModelProperty("到货时间") + private Date deliveryTime; + @ApiModelProperty("体积") + private double volume; + @ApiModelProperty("标记") + private String sign; + @ApiModelProperty("最晚发货时间") + private Date latestDeliveryTime; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; @ApiModelProperty("备注") private String remarks; diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java index b4e6b77..6ae572d 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillDto.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -17,24 +18,97 @@ import java.util.List; public class WarehouseOutBillDto { private String sid; - @ApiModelProperty("创建人sid") - private String createBySid; - @ApiModelProperty("制单人") - private String createByName; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("外部单号") - private String sourceBillNo; - - @ApiModelProperty("业务类型key") - private String busTypeKey; - @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") - private String busTypeValue; - @ApiModelProperty("单据状态") - private String billState; - @ApiModelProperty("备注") + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("外部状态") + private String externalState; + @ApiModelProperty("买家留言") + private String buyerMessage; + @ApiModelProperty("库存状态") + private String inventoryStatus; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("承运商") + private String carrierKey; + private String carrierValue; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("配送方式") + private String deliveryMethod; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("收货人") + private String consignee; + @ApiModelProperty("固话") + private String fixedLine; + @ApiModelProperty("邮编") + private String postalCode; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("区") + private String county; + @ApiModelProperty("街道") + private String street; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("实付") + private double actualPayment; + @ApiModelProperty("优惠") + private double discount; + @ApiModelProperty("运费") + private double freight; + @ApiModelProperty("重量") + private double weight; + @ApiModelProperty("估重") + private double weightEstimation; + @ApiModelProperty("商品数量") + private double quantity; + @ApiModelProperty("下单时间") + private Date orderTime; + @ApiModelProperty("订单号") + private String orderNumber; + @ApiModelProperty("外部订单号") + private String externalOrderNumber; + @ApiModelProperty("线上订单号") + private String onlineOrderNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("付款时间") + private Date paymentTime; + @ApiModelProperty("接单时间") + private Date orderAcceptanceTime; + @ApiModelProperty("拣选区域") + private String pickingArea; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("品牌") + private String brand; + @ApiModelProperty("波次") + private String waveTimes; + @ApiModelProperty("超时时间") + private Date timeoutPeriod; + @ApiModelProperty("到货时间") + private Date deliveryTime; + @ApiModelProperty("体积") + private double volume; + @ApiModelProperty("标记") + private String sign; + @ApiModelProperty("最晚发货时间") + private Date latestDeliveryTime; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; private String remarks; + private String userSid; + private String userName; private List detailsList = new ArrayList<>(); diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillGoodsQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillGoodsQuery.java new file mode 100644 index 0000000..63464c3 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillGoodsQuery.java @@ -0,0 +1,31 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/26 + **/ +@Data +public class WarehouseOutBillGoodsQuery implements Query { + private String sourceBillSid; + //商品编码 + private String goodsSkuCode; + //商品名称 + private String goodsSpuName; + //规格 + private String goodsSkuOwnSpec; + + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java index 149e00f..2f002d0 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillInventoryVo.java @@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.warehouseoutbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -11,41 +13,94 @@ import lombok.Data; @Data public class WarehouseOutBillInventoryVo { private String sid; - private String inventorySid; - @ApiModelProperty("商品ID") - private String goodsID; - @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; - @ApiModelProperty("商品名称") - private String goodsSpuName; - @ApiModelProperty("图号") - private String goodsSkuCode; - @ApiModelProperty("商品Skusid") - private String goodsSkuSid; - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; - @ApiModelProperty("规格型号") - private String goodsSkuOwnSpec; - @ApiModelProperty("计量单位") - private String unit; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("仓库名称") - private String warehouseName; - @ApiModelProperty("库位sid") - private String warehouseRackSid; - @ApiModelProperty("库位编码") - private String warehouseRackCode; - private String price;//销售单价 - private String outboundCount;// 已出库数量 - //入库单价 - private String money; - //库存数量 - private String count; - //供应商 - private String supplierSid; - private String supplierName; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("来源单号") + private String sourceBillNo; + @ApiModelProperty("外部状态") + private String externalState; + @ApiModelProperty("买家留言") + private String buyerMessage; + @ApiModelProperty("库存状态") + private String inventoryStatus; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("配送方式") + private String deliveryMethod; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("收货人") + private String consignee; + @ApiModelProperty("固话") + private String fixedLine; + @ApiModelProperty("邮编") + private String postalCode; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("区") + private String county; + @ApiModelProperty("街道") + private String street; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("实付") + private double actualPayment; + @ApiModelProperty("优惠") + private double discount; + @ApiModelProperty("运费") + private double freight; + @ApiModelProperty("重量") + private double weight; + @ApiModelProperty("估重") + private double weightEstimation; + @ApiModelProperty("商品数量") + private double quantity; + @ApiModelProperty("下单时间") + private Date orderTime; + @ApiModelProperty("订单号") + private String orderNumber; + @ApiModelProperty("外部订单号") + private String externalOrderNumber; + @ApiModelProperty("线上订单号") + private String onlineOrderNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("付款时间") + private Date paymentTime; + @ApiModelProperty("接单时间") + private Date orderAcceptanceTime; + @ApiModelProperty("拣选区域") + private String pickingArea; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("品牌") + private String brand; + @ApiModelProperty("波次") + private String waveTimes; + @ApiModelProperty("超时时间") + private Date timeoutPeriod; + @ApiModelProperty("到货时间") + private Date deliveryTime; + @ApiModelProperty("体积") + private double volume; + @ApiModelProperty("标记") + private String sign; + @ApiModelProperty("最晚发货时间") + private Date latestDeliveryTime; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + private String remarks; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java index 669cf65..b7dfbf3 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillQuery.java @@ -12,20 +12,37 @@ import lombok.Data; @Data public class WarehouseOutBillQuery implements Query { - @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("单据日期开始时间") - private String createTimeStart; - @ApiModelProperty("单据日期结束时间") - private String createTimeEnd; - @ApiModelProperty("来源单号") - private String sourceBillNo; - @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") - private String busTypeValue; - @ApiModelProperty("单据状态") private String billState; - @ApiModelProperty("组织sid全路径") + @ApiModelProperty("外部单号") + private String externalOrderNumber; + @ApiModelProperty("线上单号") + private String onlineOrderNumber; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("下单日期开始时间") + private String orderTimeStart; + @ApiModelProperty("下单日期结束时间") + private String orderTimeEnd; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") private String orgPath; @ApiModelProperty("用户sid") - private String createBySid; + private String userSid; + private int index; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java index f7a061e..d2e63e6 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillService.java @@ -1,13 +1,22 @@ package com.yxt.wms.biz.func.warehouseoutbill; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.commonmethod.CommonMethod; +import com.yxt.wms.biz.func.commonmethod.DataRule; +import com.yxt.wms.biz.func.sysstaffinfo.SysStaffinfoDetailsVo; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; +import com.yxt.wms.feign.portal.privilege.PrivilegeQuery; +import com.yxt.wms.feign.portal.sysstaffinfo.SysStaffinfoFeign; import com.yxt.wms.feign.warehouse.warehousesoutbill.WarehouseOutBillFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -18,10 +27,19 @@ public class WarehouseOutBillService extends MybatisBaseService> listPage(PagerQuery pagerQuery) { - return warehouseOutBillFeign.pageList(pagerQuery); + @Autowired + CommonMethod commonMethod; + public ResultBean> listPage(PagerQuery pq) { + WarehouseOutBillQuery query = pq.getParams(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + return warehouseOutBillFeign.pageList(pq); } public ResultBean saveOrUpdateOutBill(WarehouseOutBillDto dto) { @@ -31,29 +49,49 @@ public class WarehouseOutBillService extends MybatisBaseService details(String sid) { return warehouseOutBillFeign.details(sid); } + public ResultBean getAddresseeBySid(String sid) { + return warehouseOutBillFeign.getAddresseeBySid(sid); + } + public ResultBean> getInventoryList(PagerQuery pq) { + WarehouseOutBillGoodsQuery query = pq.getParams(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + //通用组装方法 根据用户sid、菜单、组织全路径sid 获取组装参数 + DataRule dataRule=commonMethod.dataRule(query.getOrgPath(),query.getMenuUrl(),query.getUserSid()).getData(); + pq.getParams().setOrgLevelKey(dataRule.getDataRuleId()); + pq.getParams().setIndex(dataRule.getIndex()); + PagerVo pagerVo=warehouseOutBillFeign.getInventoryList(pq).getData(); + return new ResultBean>().success().setData(pagerVo); + } + public ResultBean updateCarrier(WarehouseOutBillDto dto) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData(); + dto.setUserName(sysStaffinfoDetailsVo.getName()); + return warehouseOutBillFeign.updateCarrier(dto); + } + public ResultBean updateWaybillNumber(WarehouseOutBillDto dto) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData(); + dto.setUserName(sysStaffinfoDetailsVo.getName()); + return warehouseOutBillFeign.updateWaybillNumber(dto); + } + public ResultBean toBePickOut(WarehouseOutStateQuery query) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(query.getUserSid(),"").getData(); + query.setUserName(sysStaffinfoDetailsVo.getName()); + return warehouseOutBillFeign.toBePickOut(query); + } + public ResultBean toBeOutbound(WarehouseOutStateQuery query) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(query.getUserSid(),"").getData(); + query.setUserName(sysStaffinfoDetailsVo.getName()); + return warehouseOutBillFeign.toBeOutbound(query); + } - public ResultBean> getInventoryList(PagerQuery pagerQuery) { - WarehouseOutBillInventoryQuery query = pagerQuery.getParams(); - PagerVo pagerVo=warehouseOutBillFeign.getInventoryList(pagerQuery).getData(); -// if (StringUtils.isNotBlank(query.getBusrepairBillsid())) { -// List records = pagerVo.getRecords(); -// for (WarehouseOutBillInventoryVo record : records) { -// //维修出入库查询已出库数量 -// String billSid = query.getBusrepairBillsid(); -// String chuKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "0", record.getGoodsID()).getData(); -// String ruKuCount = asBusrepairInventorybillFeign.selOutBoundCount(billSid, "1", record.getGoodsID()).getData(); -// BigDecimal count = new BigDecimal(chuKuCount).subtract(new BigDecimal(ruKuCount)); -// if (null != count) { -// record.setOutboundCount(count.toString()); -// } else { -// record.setOutboundCount("0"); -// } -// } -// } - return new ResultBean>().success().setData(pagerVo); + public ResultBean toBeAllocated(WarehouseOutStateQuery query) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(query.getUserSid(),"").getData(); + query.setUserName(sysStaffinfoDetailsVo.getName()); + return warehouseOutBillFeign.toBeAllocated(query); } public ResultBean confirm(WarehouseOutBillDto dto) { + SysStaffinfoDetailsVo sysStaffinfoDetailsVo=sysStaffinfoFeign.fetchBySid(dto.getUserSid(),"").getData(); + dto.setUserName(sysStaffinfoDetailsVo.getName()); return warehouseOutBillFeign.confirm(dto); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java index aff0105..323cc61 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutBillVo.java @@ -3,6 +3,8 @@ package com.yxt.wms.biz.func.warehouseoutbill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -15,16 +17,92 @@ public class WarehouseOutBillVo { @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("单据日期") - private String createTime; - @ApiModelProperty("制单人") - private String createByName; @ApiModelProperty("来源单号") private String sourceBillNo; - @ApiModelProperty("业务类型value（（销售出库、采购退货出库等））") - private String busTypeValue; - @ApiModelProperty("单据状态：已完成/已发货") - private String billState; + @ApiModelProperty("外部状态") + private String externalState; + @ApiModelProperty("买家留言") + private String buyerMessage; + @ApiModelProperty("库存状态") + private String inventoryStatus; + @ApiModelProperty("货主") + private String shipper; + @ApiModelProperty("承运商") + private String carrierKey; + private String carrierValue; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("配送方式") + private String deliveryMethod; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("收货人") + private String consignee; + @ApiModelProperty("固话") + private String fixedLine; + @ApiModelProperty("邮编") + private String postalCode; + @ApiModelProperty("省") + private String province; + @ApiModelProperty("市") + private String city; + @ApiModelProperty("区") + private String county; + @ApiModelProperty("街道") + private String street; + @ApiModelProperty("详细地址") + private String address; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("实付") + private double actualPayment; + @ApiModelProperty("优惠") + private double discount; + @ApiModelProperty("运费") + private double freight; + @ApiModelProperty("重量") + private double weight; + @ApiModelProperty("估重") + private double weightEstimation; + @ApiModelProperty("商品数量") + private double quantity; + @ApiModelProperty("下单时间") + private Date orderTime; + @ApiModelProperty("订单号") + private String orderNumber; + @ApiModelProperty("外部订单号") + private String externalOrderNumber; + @ApiModelProperty("线上订单号") + private String onlineOrderNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("付款时间") + private Date paymentTime; + @ApiModelProperty("接单时间") + private Date orderAcceptanceTime; + @ApiModelProperty("拣选区域") + private String pickingArea; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("品牌") + private String brand; + @ApiModelProperty("波次") + private String waveTimes; + @ApiModelProperty("超时时间") + private Date timeoutPeriod; + @ApiModelProperty("到货时间") + private Date deliveryTime; + @ApiModelProperty("体积") + private double volume; + @ApiModelProperty("标记") + private String sign; + @ApiModelProperty("最晚发货时间") + private Date latestDeliveryTime; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + private String remarks; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutStateQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutStateQuery.java new file mode 100644 index 0000000..3945482 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbill/WarehouseOutStateQuery.java @@ -0,0 +1,15 @@ +package com.yxt.wms.biz.func.warehouseoutbill; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/8/15 16:19 + */ +@Data +public class WarehouseOutStateQuery { + private String billState;//0 待分配 1 零拣 2待出库 3已出库 + private String sid; + private String userSid; + private String userName; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java index 7c87385..6d21b76 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetail.java @@ -14,10 +14,11 @@ import java.util.Date; **/ @Data public class WarehouseOutBillDetail extends BaseEntity { + private String sid; @ApiModelProperty("单据sid") - private String billSid; - @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; + private String sourceBillSid; + @ApiModelProperty("图片") + private String pic; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") @@ -28,22 +29,31 @@ public class WarehouseOutBillDetail extends BaseEntity { private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; + @ApiModelProperty("条码") + private String barCode; @ApiModelProperty("计量单位") private String unit; + @ApiModelProperty("单价") + private BigDecimal price; @ApiModelProperty("订单数量") private BigDecimal orderCount; - @ApiModelProperty("未结数量") - private BigDecimal remainingCount; - @ApiModelProperty("调整数量") - private BigDecimal adjustCount; - @ApiModelProperty("分配数量") - private BigDecimal distributeCount; - @ApiModelProperty("发货数量") - private BigDecimal deliveryCount; - @ApiModelProperty("状态（新建/已发货完成、部分分配、全部分配等）") - private Integer billState; - @ApiModelProperty("发货时间") - private Date deliveTime; - + @ApiModelProperty("应收价格") + private BigDecimal receivable; + @ApiModelProperty("实际价格") + private BigDecimal actualPrice; + @ApiModelProperty("销售金额") + private BigDecimal salesAmount; + @ApiModelProperty("序列号") + private String serialNumber; + @ApiModelProperty("库位") + private String rackState; + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("生产日期") + private Date dateOfManufacture; + @ApiModelProperty("过期日期") + private Date expirationDate; + @ApiModelProperty("批次扩展属性") + private String batchExpansion; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java index 0ec95dd..af1c8ec 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailDto.java @@ -3,6 +3,9 @@ package com.yxt.wms.biz.func.warehouseoutbilldetail; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -12,11 +15,10 @@ import lombok.Data; public class WarehouseOutBillDetailDto { private String sid; - @ApiModelProperty("库存商品sid") - private String inventorySid; - - @ApiModelProperty("商品基础信息Sid") - private String goodSpuSid; + @ApiModelProperty("单据sid") + private String sourceBillSid; + @ApiModelProperty("图片") + private String pic; @ApiModelProperty("商品名称") private String goodsSpuName; @ApiModelProperty("商品Skusid") @@ -27,24 +29,32 @@ public class WarehouseOutBillDetailDto { private String goodsSkuCode; @ApiModelProperty("规格型号") private String goodsSkuOwnSpec; + @ApiModelProperty("条码") + private String barCode; @ApiModelProperty("计量单位") private String unit; - - - @ApiModelProperty("出库数量") - private String outCount; - @ApiModelProperty("仓库sid") - private String warehouseSid; - //仓库名称 - private String warehouseName; - //库位sid - private String warehouseRackSid; - //库位编码 - private String warehouseRackCode; - //销售单价 - private String money; - //金额 - private String moneyAll; + @ApiModelProperty("单价") + private BigDecimal price; + @ApiModelProperty("订单数量") + private BigDecimal orderCount; + @ApiModelProperty("应收价格") + private BigDecimal receivable; + @ApiModelProperty("实际价格") + private BigDecimal actualPrice; + @ApiModelProperty("销售金额") + private BigDecimal salesAmount; + @ApiModelProperty("序列号") + private String serialNumber; + @ApiModelProperty("库位") + private String rackState; + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("生产日期") + private Date dateOfManufacture; + @ApiModelProperty("过期日期") + private Date expirationDate; + @ApiModelProperty("批次扩展属性") + private String batchExpansion; } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java index b848897..48666e5 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.java @@ -12,7 +12,5 @@ import java.util.List; **/ @Mapper public interface WarehouseOutBillDetailMapper extends BaseMapper { - int deleteByMainSid(String sid); - List selectDetailsList(String sid); } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml index 7890b6f..6f49b92 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailMapper.xml @@ -1,21 +1,5 @@ - - delete - from wms_out_bill_detail - where billSid = #{sid} - - \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java new file mode 100644 index 0000000..9d487cc --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailQuery.java @@ -0,0 +1,13 @@ +package com.yxt.wms.biz.func.warehouseoutbilldetail; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/6/6 16:42 + */ +@Data +public class WarehouseOutBillDetailQuery implements Query { + private String name; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java index 3efe23b..32eeafc 100644 --- a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailService.java @@ -2,6 +2,9 @@ package com.yxt.wms.biz.func.warehouseoutbilldetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.feign.warehouse.warehousesoutbilldetail.WarehouseOutBillDetailFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -13,19 +16,9 @@ import java.util.List; **/ @Service public class WarehouseOutBillDetailService extends MybatisBaseService { - public void saveOrUpdateBillDetails(String sid, List detailsList) { - //删除 - baseMapper.deleteByMainSid(sid); - for (int i = 0; i < detailsList.size(); i++) { - WarehouseOutBillDetailDto wmsOutBillDetailDto = detailsList.get(i); - WarehouseOutBillDetail wmsOutBillDetail = new WarehouseOutBillDetail(); - BeanUtil.copyProperties(wmsOutBillDetailDto, wmsOutBillDetail, "sid"); - wmsOutBillDetail.setBillSid(sid); - baseMapper.insert(wmsOutBillDetail); - } - } - - public List selectDetailsList(String sid) { - return baseMapper.selectDetailsList(sid); + @Autowired + WarehouseOutBillDetailFeign warehouseOutBillDetailFeign; + public ResultBean> selectDetailsByBillSid(String sid) { + return warehouseOutBillDetailFeign.selectDetailsByBillSid(sid); } } diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailVo.java new file mode 100644 index 0000000..07a8ee2 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutbilldetail/WarehouseOutBillDetailVo.java @@ -0,0 +1,59 @@ +package com.yxt.wms.biz.func.warehouseoutbilldetail; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/12 + **/ +@Data +public class WarehouseOutBillDetailVo { + private String sid; + @ApiModelProperty("单据sid") + private String sourceBillSid; + @ApiModelProperty("图片") + private String pic; + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品Skusid") + private String goodsSkuSid; + @ApiModelProperty("商品Sku名称") + private String goodsSkuTitle; + @ApiModelProperty("商品sku编码") + private String goodsSkuCode; + @ApiModelProperty("规格型号") + private String goodsSkuOwnSpec; + @ApiModelProperty("条码") + private String barCode; + @ApiModelProperty("计量单位") + private String unit; + @ApiModelProperty("单价") + private BigDecimal price; + @ApiModelProperty("订单数量") + private BigDecimal orderCount; + @ApiModelProperty("应收价格") + private BigDecimal receivable; + @ApiModelProperty("实际价格") + private BigDecimal actualPrice; + @ApiModelProperty("销售金额") + private BigDecimal salesAmount; + @ApiModelProperty("序列号") + private String serialNumber; + @ApiModelProperty("库位状态") + private String rackState; + private String rackStateValue; + @ApiModelProperty("批次号") + private String batchNumber; + @ApiModelProperty("生产日期") + private Date dateOfManufacture; + @ApiModelProperty("过期日期") + private Date expirationDate; + @ApiModelProperty("批次扩展属性") + private String batchExpansion; + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocation.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocation.java new file mode 100644 index 0000000..ffd3bb6 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocation.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehouseoutlocation; + +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutLocation extends BaseEntity { + + + @ApiModelProperty("来源单") + private String sourceBillSid; + @ApiModelProperty("sku") + private String goodsSkuSid; + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品title") + private String goodsSpuTitle; + @ApiModelProperty("商品规格编码") + private String goodsSkuCode; + @ApiModelProperty("数量") + private String count; + @ApiModelProperty("库位sid") + private String rackSid; + @ApiModelProperty("库位编码") + private String rackCode; + private String spec; + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationDto.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationDto.java new file mode 100644 index 0000000..5f5f79f --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationDto.java @@ -0,0 +1,39 @@ +package com.yxt.wms.biz.func.warehouseoutlocation; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutLocationDto { + private String sid; + @ApiModelProperty("来源单") + private String sourceBillSid; + @ApiModelProperty("sku") + private String goodsSkuSid; + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品title") + private String goodsSpuTitle; + @ApiModelProperty("商品规格编码") + private String goodsSkuCode; + @ApiModelProperty("数量") + private BigDecimal count; + @ApiModelProperty("库位sid") + private String rackSid; + @ApiModelProperty("库位编码") + private String rackCode; + private String inventorySid; + private BigDecimal initialCount; + private String locationSid; + private String spec; + + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.java new file mode 100644 index 0000000..a1ea8ce --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.java @@ -0,0 +1,18 @@ +package com.yxt.wms.biz.func.warehouseoutlocation; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Mapper +public interface WarehouseOutLocationMapper extends BaseMapper { + + WarehouseOutLocationVo details(@Param("sid") String sid); + +} + diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.xml b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.xml new file mode 100644 index 0000000..4554cce --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationMapper.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationQuery.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationQuery.java new file mode 100644 index 0000000..ea98639 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationQuery.java @@ -0,0 +1,49 @@ +package com.yxt.wms.biz.func.warehouseoutlocation; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutLocationQuery implements Query { + + @ApiModelProperty("单据编号") + private String billNo; + private String billState; + @ApiModelProperty("外部单号") + private String externalOrderNumber; + @ApiModelProperty("线上单号") + private String onlineOrderNumber; + @ApiModelProperty("买家") + private String buyer; + @ApiModelProperty("运单号") + private String waybillNumber; + @ApiModelProperty("平台") + private String platform; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("手机") + private String mobile; + @ApiModelProperty("出库类型") + private String outboundType; + @ApiModelProperty("地址") + private String address; + @ApiModelProperty("下单日期开始时间") + private String orderTimeStart; + @ApiModelProperty("下单日期结束时间") + private String orderTimeEnd; + + private String orgLevelKey;//权限等级 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private int index; +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationService.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationService.java new file mode 100644 index 0000000..b645170 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationService.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehouseoutlocation; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.result.ResultBean; +import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventory; +import com.yxt.wms.biz.func.warehouseinventory.WarehouseInventoryService; +import com.yxt.wms.feign.warehouse.warehouseoutlocation.WarehouseOutLocationFeign; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Service +public class WarehouseOutLocationService extends MybatisBaseService { + @Autowired + WarehouseOutLocationFeign warehouseOutLocationFeign; + + + public ResultBean save(List dtos) { + return warehouseOutLocationFeign.save(dtos); + } + + public ResultBean> details(String sid) { + return warehouseOutLocationFeign.details(sid); + } + +} diff --git a/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationVo.java b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationVo.java new file mode 100644 index 0000000..80679ae --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/biz/func/warehouseoutlocation/WarehouseOutLocationVo.java @@ -0,0 +1,35 @@ +package com.yxt.wms.biz.func.warehouseoutlocation; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2024/4/24 + **/ +@Data +public class WarehouseOutLocationVo { + + private String sid; + @ApiModelProperty("来源单") + private String sourceBillSid; + @ApiModelProperty("sku") + private String goodsSkuSid; + + @ApiModelProperty("商品名称") + private String goodsSpuName; + @ApiModelProperty("商品title") + private String goodsSpuTitle; + @ApiModelProperty("商品规格编码") + private String goodsSkuCode; + @ApiModelProperty("数量") + private String count; + @ApiModelProperty("库位sid") + private String rackSid; + @ApiModelProperty("库位编码") + private String rackCode; + + private String spec; + +} diff --git a/wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java b/wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java deleted file mode 100644 index 11d995f..0000000 --- a/wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeign.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.yxt.wms.feign.base.basesupplierinfo; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.supplierinfo.*; -import io.swagger.annotations.ApiOperation; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/3/26 17:12 - */ -@FeignClient( - contextId = "ss-common-goods-BaseSupplierInfo", - name = "ss-common-goods", - path = "/apiadmin/base/basesupplierinfo", - fallback = BaseSupplierInfoFeignFallback.class) -public interface BaseSupplierInfoFeign { - - @ApiOperation("根据SID获取供应商") - @GetMapping("/fetchDetailsBySid/{sid}") - ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - - - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("新增或修改") - @PostMapping("/save") - public ResultBean save(@RequestBody SupplierInfoDto dto); - - @ApiOperation("根据sid批量删除") - @DeleteMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids); - - - - @ApiOperation("选择供应商") - @PostMapping("/choiceSupplierInfo") - public ResultBean> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid); -} diff --git a/wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java deleted file mode 100644 index 1469134..0000000 --- a/wms/src/main/java/com/yxt/wms/feign/base/basesupplierinfo/BaseSupplierInfoFeignFallback.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.yxt.wms.feign.base.basesupplierinfo; - -import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.func.supplierinfo.*; -import org.springframework.stereotype.Component; - -import java.util.List; - -/** - * @author wangpengfei - * @date 2024/3/26 17:12 - */ -@Component -public class BaseSupplierInfoFeignFallback implements BaseSupplierInfoFeign { - - - @Override - public ResultBean fetchDetailsBySid(String sid) { - return null; - } - - @Override - public ResultBean> listPage(PagerQuery pq) { - return null; - } - - @Override - public ResultBean save(SupplierInfoDto dto) { - return null; - } - - - @Override - public ResultBean delBySids(String[] sids) { - return null; - } - - @Override - public ResultBean> choiceSupplierInfo(String createOrgSid) { - return null; - } -} diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeign.java new file mode 100644 index 0000000..ce2d65f --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeign.java @@ -0,0 +1,44 @@ +package com.yxt.wms.feign.warehouse.warehouseinvoice; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryrecord.*; +import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceDto; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseInvoice", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseinvoice", + fallback = WarehouseInvoiceFeignFallback.class) +public interface WarehouseInvoiceFeign { + @ApiOperation("保存修改") + @PostMapping("/saveOrUpdate") + ResultBean saveOrUpdate(@RequestBody WarehouseInvoiceDto dto); + + @ApiOperation("详情") + @GetMapping("/details") + ResultBean details(@RequestParam("sid") String sid); +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeignFallback.java new file mode 100644 index 0000000..d536e9f --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoice/WarehouseInvoiceFeignFallback.java @@ -0,0 +1,40 @@ +package com.yxt.wms.feign.warehouse.warehouseinvoice; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryrecord.*; +import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceDto; +import com.yxt.wms.biz.func.warehouseinvoice.WarehouseInvoiceVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseInvoiceFeignFallback implements WarehouseInvoiceFeign { + + + @Override + public ResultBean saveOrUpdate(WarehouseInvoiceDto dto) { + return null; + } + + @Override + public ResultBean details(String sid) { + return null; + } +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeign.java new file mode 100644 index 0000000..f50af63 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeign.java @@ -0,0 +1,37 @@ +package com.yxt.wms.feign.warehouse.warehouseinvoiceout; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryrecord.*; +import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseInvoiceOut", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseinvoiceout", + fallback = WarehouseInvoiceOutFeignFallback.class) +public interface WarehouseInvoiceOutFeign { + + +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeignFallback.java new file mode 100644 index 0000000..bafb0a7 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseinvoiceout/WarehouseInvoiceOutFeignFallback.java @@ -0,0 +1,28 @@ +package com.yxt.wms.feign.warehouse.warehouseinvoiceout; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventoryrecord.*; +import com.yxt.wms.biz.func.warehouseinventoryrecord.report.*; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseInvoiceOutFeignFallback implements WarehouseInvoiceOutFeign { + +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeign.java new file mode 100644 index 0000000..2d91d33 --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeign.java @@ -0,0 +1,45 @@ +package com.yxt.wms.feign.warehouse.warehouseoutlocation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventory.*; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationDto; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseOutLocation", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseoutlocation", + fallback = WarehouseOutLocationFeignFallback.class) +public interface WarehouseOutLocationFeign { + + @ApiOperation("保存修改") + @PostMapping("/save") + ResultBean save(@RequestBody List dtos); + + @ApiOperation("详情") + @GetMapping("/details") + ResultBean> details(@RequestParam("sid") String sid); + +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeignFallback.java new file mode 100644 index 0000000..9a8807f --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehouseoutlocation/WarehouseOutLocationFeignFallback.java @@ -0,0 +1,40 @@ +package com.yxt.wms.feign.warehouse.warehouseoutlocation; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseinventory.*; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationDto; +import com.yxt.wms.biz.func.warehouseoutlocation.WarehouseOutLocationVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseOutLocationFeignFallback implements WarehouseOutLocationFeign { + + + + @Override + public ResultBean save(List dtos) { + return null; + } + + @Override + public ResultBean> details(String sid) { + return null; + } +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java index 4dbdab1..e1c298c 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeign.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; + /** * Project: anrui_portal(门户建设)
* File: SysRoleFeign.java
@@ -26,7 +28,7 @@ import org.springframework.web.bind.annotation.*; @FeignClient( contextId = "ss-common-warehouse-WarehouseInventory", name = "ss-common-warehouse", - path = "/apiadmin/warehouseinventory", + path = "/apiadmin/inventory/Warehouseinventory", fallback = WarehouseInventoryFeignFallback.class) public interface WarehouseInventoryFeign { @@ -86,4 +88,9 @@ public interface WarehouseInventoryFeign { @ApiOperation("根据Sid获取库存实体") @PostMapping("/fetchEntityBySid") ResultBean fetchEntityBySid(@RequestParam("sid") String sid); + @ApiOperation("根据skuSid查询商品可用库存") + @GetMapping("/selAvailableBySkuSid") + public ResultBean> selAvailableBySkuSid(@RequestParam("skuSid") String skuSid, + @RequestParam("sourceBillSid") String sourceBillSid, + @RequestParam("orgSid") String orgSid) ; } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java index d292f12..214f45a 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesinventory/WarehouseInventoryFeignFallback.java @@ -6,6 +6,8 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.warehouseinventory.*; import org.springframework.stereotype.Component; +import java.util.List; + /** * Project: anrui_portal(门户建设)
* File: SysRoleFeignFallback.java
@@ -91,4 +93,10 @@ public class WarehouseInventoryFeignFallback implements WarehouseInventoryFeign public ResultBean fetchEntityBySid(String sid) { return null; } + + @Override + public ResultBean> selAvailableBySkuSid(String skuSid, String sourceBillSid,String orgSid) { + return null; + } + } \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java index e0999fa..b24568c 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeign.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.warehouseoutbill.*; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; @@ -41,11 +42,27 @@ public interface WarehouseOutBillFeign { @ApiOperation("详情") @GetMapping("/details") ResultBean details(@RequestParam("sid") String sid); - + @ApiOperation("收件地址") + @GetMapping("/getAddresseeBySid") + ResultBean getAddresseeBySid(@RequestParam("sid") String sid); @ApiOperation("选择商品分页列表") @PostMapping("/getInventoryList") - ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery); - + ResultBean> getInventoryList(@RequestBody PagerQuery pagerQuery); + @ApiOperation("修改承运商") + @PostMapping("/updateCarrier") + public ResultBean updateCarrier(WarehouseOutBillDto dto); + @ApiOperation("修改运单号") + @PostMapping("/updateWaybillNumber") + public ResultBean updateWaybillNumber(WarehouseOutBillDto dto); + @ApiOperation("待分配-->打到零拣") + @PostMapping("/toBePickOut") + ResultBean toBePickOut(@RequestBody WarehouseOutStateQuery query); + @ApiOperation("零拣打单 --> 待出库") + @PostMapping("/toBeOutbound") + ResultBean toBeOutbound(@RequestBody WarehouseOutStateQuery query); + @ApiOperation("零拣打单--->待分配") + @PostMapping("/toBeAllocated") + ResultBean toBeAllocated(@RequestBody WarehouseOutStateQuery query); @ApiOperation("确认") @PostMapping("/confirm") ResultBean confirm(@RequestBody WarehouseOutBillDto dto); diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java index 0239b5a..3b75662 100644 --- a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbill/WarehouseOutBillFeignFallback.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.wms.biz.func.warehouseoutbill.*; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; import org.springframework.stereotype.Component; /** @@ -39,10 +40,41 @@ public class WarehouseOutBillFeignFallback implements WarehouseOutBillFeign { } @Override - public ResultBean> getInventoryList(PagerQuery pagerQuery) { + public ResultBean getAddresseeBySid(String sid) { return null; } + @Override + public ResultBean> getInventoryList(PagerQuery pagerQuery) { + return null; + } + + @Override + public ResultBean updateCarrier(WarehouseOutBillDto dto) { + return null; + } + + @Override + public ResultBean updateWaybillNumber(WarehouseOutBillDto dto) { + return null; + } + + @Override + public ResultBean toBePickOut(WarehouseOutStateQuery query) { + return null; + } + + @Override + public ResultBean toBeOutbound(WarehouseOutStateQuery query) { + return null; + } + + @Override + public ResultBean toBeAllocated(WarehouseOutStateQuery query) { + return null; + } + + @Override public ResultBean confirm(WarehouseOutBillDto dto) { return null; diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeign.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeign.java new file mode 100644 index 0000000..9b40bed --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeign.java @@ -0,0 +1,39 @@ +package com.yxt.wms.feign.warehouse.warehousesoutbilldetail; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseoutbill.*; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeign.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeign
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "收货单据") +@FeignClient( + contextId = "ss-common-warehouse-WarehouseOutBillDetail", + name = "ss-common-warehouse", + path = "/apiadmin/warehouseoutbilldetail", + fallback = WarehouseOutBillDetailFeignFallback.class) +public interface WarehouseOutBillDetailFeign { + @ApiOperation("根据SID获取一条记录") + @GetMapping("/selectDetailsByBillSid") + public ResultBean> selectDetailsByBillSid(@RequestParam("sid") String sid); + +} \ No newline at end of file diff --git a/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeignFallback.java b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeignFallback.java new file mode 100644 index 0000000..d83756c --- /dev/null +++ b/wms/src/main/java/com/yxt/wms/feign/warehouse/warehousesoutbilldetail/WarehouseOutBillDetailFeignFallback.java @@ -0,0 +1,32 @@ +package com.yxt.wms.feign.warehouse.warehousesoutbilldetail; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.wms.biz.func.warehouseoutbill.*; +import com.yxt.wms.biz.func.warehouseoutbilldetail.WarehouseOutBillDetailVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysRoleFeignFallback.java
+ * Class: com.yxt.anrui.portal.api.sysrole.SysRoleFeignFallback
+ * Description: 角色.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class WarehouseOutBillDetailFeignFallback implements WarehouseOutBillDetailFeign { + + @Override + public ResultBean> selectDetailsByBillSid(String sid) { + return null; + } +} \ No newline at end of file