From 823520b4c3e7e5648923dc3e378e5685a1b8039d Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 6 Aug 2024 14:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/PurchaseInventoryBillRest.java | 11 +-- .../apiadmin/WarehouseAnsBillRest.java | 6 +- .../PurchaseInventoryBillDto2.java | 7 +- .../PurchaseInventoryBillService.java | 20 ++-- .../PurchaseInventoryBillDetailDto2.java | 95 +++++++++---------- .../PurchaseInventoryBillDetailService.java | 21 ++-- .../WarehouseAndBillDetailVo.java | 66 +++++++++++++ .../WarehouseAnsBillMapper.java | 1 + .../WarehouseAnsBillMapper.xml | 32 ++++++- .../WarehouseAnsBillService.java | 65 ++++++++++++- .../WarehouseAnsBillDetail.java | 2 +- .../WarehouseAnsBillDetailService.java | 2 +- .../warehousearea/WarehouseAreaService.java | 3 + .../warehouserack/WarehouseRackService.java | 3 + .../WarehouseReceiptBillService.java | 2 +- 15 files changed, 251 insertions(+), 85 deletions(-) create mode 100644 src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAndBillDetailVo.java diff --git a/src/main/java/com/yxt/warehouse/apiadmin/PurchaseInventoryBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/PurchaseInventoryBillRest.java index d631798..b5a3919 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/PurchaseInventoryBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/PurchaseInventoryBillRest.java @@ -6,11 +6,14 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.purchaseinventorybill.PurchaseInventoryBillQuery; import com.yxt.warehouse.biz.purchaseinventorybill.PurchaseInventoryBillService; import com.yxt.warehouse.biz.purchaseinventorybill.*; +import com.yxt.warehouse.biz.purchaseinventorybilldetail.PurchaseInventoryBillDetailVo; 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/1 17:46 @@ -35,13 +38,9 @@ public class PurchaseInventoryBillRest { return purchaseInventoryBillService.saveOrUpdateBill2(dto); } - @ApiOperation("通知单收货单初始化") - @GetMapping("/getInitDetails") - ResultBean getInitDetails(@RequestParam("sourceSid") String sourceSid) { - return purchaseInventoryBillService.getInitDetails(sourceSid); - } - @ApiOperation("收货单据编辑初始化/详情") + + @ApiOperation("采购入库单据编辑初始化/详情") @GetMapping("/selectByBillSid") ResultBean selectByBillSid(@RequestParam("sid") String sid) { return purchaseInventoryBillService.selectByBillSid(sid); diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java index 57e98e2..9dd2aa8 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillRest.java @@ -45,7 +45,11 @@ public class WarehouseAnsBillRest { ResultBean> rb = ResultBean.fireFail(); return wmsAnsBillService.listPages(pagerQuery); } - + @PostMapping("listPageAns") + @ApiOperation("选择预约单分页列表") + ResultBean> listPageAns(@RequestBody PagerQuery pagerQuery) { + return wmsAnsBillService.listPageAns(pagerQuery); + } @GetMapping("details") @ApiOperation("详情") ResultBean details(@RequestParam("sid") String sid) { diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java index 71458f7..37b72dc 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillDto2.java @@ -1,6 +1,7 @@ package com.yxt.warehouse.biz.purchaseinventorybill; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.warehouse.biz.purchaseinventorybilldetail.PurchaseInventoryBillDetailDto2; import com.yxt.warehouse.biz.warehousereceiptbilldetail.WarehouseReceiptBillDetailDto2; import com.yxt.warehouse.biz.warehousereceiptbilldetailbatch.WarehouseReceiptBillDetailBatchDto2; import io.swagger.annotations.ApiModelProperty; @@ -63,7 +64,7 @@ public class PurchaseInventoryBillDto2 { @ApiModelProperty("备注") private String remarks; @ApiModelProperty("商品列表") - private List list = new ArrayList<>(); - @ApiModelProperty("批次列表") - private List pcList = new ArrayList<>(); + private List list = new ArrayList<>(); +// @ApiModelProperty("批次列表") +// private List pcList = new ArrayList<>(); } diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java index 65fc946..1437583 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybill/PurchaseInventoryBillService.java @@ -101,12 +101,13 @@ public class PurchaseInventoryBillService extends MybatisBaseService list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); - List pcList = dto.getPcList(); - pcList.removeAll(Collections.singleton(null)); +// List pcList = dto.getPcList(); +// pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { // purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); + purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list); } baseMapper.insert(wmsReceiptBill); @@ -116,12 +117,13 @@ public class PurchaseInventoryBillService extends MybatisBaseService list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); - List pcList = dto.getPcList(); - pcList.removeAll(Collections.singleton(null)); +// List pcList = dto.getPcList(); +// pcList.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { // purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList); + purchaseInventoryBillDetailService.saveOrUpdateDetailsList2(sid, list); } baseMapper.updateById(wmsReceiptBill); } @@ -196,12 +198,12 @@ public class PurchaseInventoryBillService extends MybatisBaseService confirm(PurchaseInventoryBillDto2 dto) { ResultBean rb = ResultBean.fireFail(); // dto.setBillState("1"); - List list = dto.getList(); + List list = dto.getList(); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { for (int i = 0; i < list.size(); i++) { - WarehouseReceiptBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); - wmsReceiptBillDetailDto2.setState(1); + PurchaseInventoryBillDetailDto2 wmsReceiptBillDetailDto2 = list.get(i); +// wmsReceiptBillDetailDto2.setState(1); } } dto.setList(list); diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java index 8091c44..04f6be3 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailDto2.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; +import java.util.Date; + /** * @description: * @author: dimengzhe @@ -12,58 +15,48 @@ import lombok.Data; @Data public class PurchaseInventoryBillDetailDto2 { - @ApiModelProperty("商品Skusid") + @ApiModelProperty("来源单sid") + private String sourceBillSid; + @ApiModelProperty("图示") + private String illustration; + @ApiModelProperty("商品skusid") private String goodsSkuSid; - @ApiModelProperty("商品Sku名称") - private String goodsSkuTitle; - @ApiModelProperty("商品sku编码") - private String goodsSkuCode; - @ApiModelProperty("规格型号") - private String goodsSkuOwnSpec; - @ApiModelProperty("计量单位") - private String unit; - @ApiModelProperty("仓库sid") - private String warehouseSid; - @ApiModelProperty("仓库名称") - private String warehouseName; - @ApiModelProperty("库位sid") + @ApiModelProperty("商品名称") + private String goodsName; + @ApiModelProperty("商品编码") + private String goodsCode; + @ApiModelProperty("商品条码") + private String goodsBarCode; + @ApiModelProperty("规格值") + private String specValue; + @ApiModelProperty("箱条码") + private String boxBarCode; + @ApiModelProperty("箱规格") + private String boxSpec; + @ApiModelProperty("单位sid") + private String unitSid; + @ApiModelProperty("单位名称") + private BigDecimal unitName; + @ApiModelProperty("成本单价") + private BigDecimal price; + @ApiModelProperty("总价") + private String totalPrice; + @ApiModelProperty("数量") + private Date count; + @ApiModelProperty("辅助单位") + private Integer auxiliaryUnits; + @ApiModelProperty("序列号") + private Integer serialNumber; + @ApiModelProperty("生产批次号") + private String batchNumber; + + @ApiModelProperty("入库库位sid") private String warehouseRackSid; - @ApiModelProperty("库位名称") + @ApiModelProperty("入库库位名") private String warehouseRackName; - @ApiModelProperty("实收数量") - private String actualInCount; - @ApiModelProperty("拒收数量") - private String rejectCount; - @ApiModelProperty("拒收原因") - private String rejectReason; - @ApiModelProperty("是否需要质检（不需要0，需要1）") - private Integer isQuality; - @ApiModelProperty("质检状态（合格0，不合格1）") - private Integer qualityState; - @ApiModelProperty("载具说明") - private String packageRemark; - @ApiModelProperty("单据明细状态：0新建，1已完成") - private Integer state; - @ApiModelProperty("序号") - private String xh; - @JsonIgnore - private String detailsSid; - - @ApiModelProperty("预约数量（采购订单数量）") - private String orderCount; - - - //入库价 - @ApiModelProperty("单位成本（采购价）") - private String cost; - @ApiModelProperty("税额") - private String taxAmount; - @ApiModelProperty("含税价") - private String taxPrice; - //采购金额 - @ApiModelProperty("金额") - private String amount; - - @ApiModelProperty("有效天数") - private String shelfLife; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; } diff --git a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java index db4ea4a..3d73bd9 100644 --- a/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java +++ b/src/main/java/com/yxt/warehouse/biz/purchaseinventorybilldetail/PurchaseInventoryBillDetailService.java @@ -30,22 +30,23 @@ public class PurchaseInventoryBillDetailService extends MybatisBaseService list, List pcList) { +// public void saveOrUpdateDetailsList2(String sid, List list, List pcList) { + public void saveOrUpdateDetailsList2(String sid, List list) { baseMapper.deleteByBillSid(sid); list.forEach(v -> { PurchaseInventoryBillDetail wmsReceiptBillDetail = new PurchaseInventoryBillDetail(); BeanUtil.copyProperties(v, wmsReceiptBillDetail, "sid"); // wmsReceiptBillDetail.setBillSid(sid); baseMapper.insert(wmsReceiptBillDetail); - wmsReceiptBillDetailBatchService.deleteByDetails(sid); - pcList.removeAll(Collections.singleton(null)); - if (!pcList.isEmpty()) { - List pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList()); - pcList2.removeAll(Collections.singleton(null)); - if (!pcList2.isEmpty()) { - wmsReceiptBillDetailBatchService.saveBatchs2(sid, wmsReceiptBillDetail.getSid(), pcList2); - } - } +// wmsReceiptBillDetailBatchService.deleteByDetails(sid); +// pcList.removeAll(Collections.singleton(null)); +// if (!pcList.isEmpty()) { +// List pcList2 = pcList.stream().filter(c -> c.getXh().equals(v.getXh())).collect(Collectors.toList()); +// pcList2.removeAll(Collections.singleton(null)); +// if (!pcList2.isEmpty()) { +// wmsReceiptBillDetailBatchService.saveBatchs2(sid, wmsReceiptBillDetail.getSid(), pcList2); +// } +// } }); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAndBillDetailVo.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAndBillDetailVo.java new file mode 100644 index 0000000..bf50f2e --- /dev/null +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAndBillDetailVo.java @@ -0,0 +1,66 @@ +package com.yxt.warehouse.biz.warehouseansbill; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetail; +import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/8/5 9:43 + */ +@Data +public class WarehouseAndBillDetailVo { + private String sid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("申请时间") + private Date applicationTime; + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("业务类型key（采购入库、收货入库、其他入库）") + private String busTypeKey; + @ApiModelProperty("业务类型value（采购入库、收货入库、其他入库）") + private String busTypeKeyValue; + + @ApiModelProperty("货物状态（在途、部分收货、已收货、已取消）") + private Integer billState; + private String billStateValue; + @ApiModelProperty("仓库sid") + private String warehouseSid; + @ApiModelProperty("仓库名") + private String warehouseName; + @ApiModelProperty("库区sid") + private String warehouseRackSid; + @ApiModelProperty("库区名") + private String warehouseRackName; + @ApiModelProperty("申请人") + private String applicant; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + @ApiModelProperty("预约时间") + private Date reservationTime; + @ApiModelProperty("供应商sid") + private String supplierSid; + @ApiModelProperty("供应商") + private String supplierName; + @ApiModelProperty("外部单号") + private String sourceBillNo; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系电话") + private String mobile; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + private String remarks; + @ApiModelProperty("承运商") + private String carrier; + @ApiModelProperty("运单号") + private String waybillNumber; + List warehouseAnsBillDetails =new ArrayList<>(); +} diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java index 8fd75af..1946d9f 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.java @@ -21,6 +21,7 @@ public interface WarehouseAnsBillMapper extends BaseMapper { IPage listPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); IPage listPages(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + IPage listPages1(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List listExcel(@Param(Constants.WRAPPER) QueryWrapper qw); List listExcel1(@Param(Constants.WRAPPER) QueryWrapper qw); List listExcel2(@Param("sids")String[]sids); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml index 6efc0e4..f3fb156 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml +++ b/src/main/java/com/yxt/warehouse/biz/warehouseansbill/WarehouseAnsBillMapper.xml @@ -33,7 +33,37 @@ end as busTypeKeyValue from warehouse_ans_bill wab LEFT JOIN ss_user.sys_organization as s ON wab.useOrgSid = s.sid - left join warehouse_ans_bill_detail wabd on wab.sid =wabd.billSid + left join warehouse_ans_bill_detail wabd on wab.sid =wabd.sourceBillSid + + ${ew.sqlSegment} + + order by wab.id desc + +