预约到货通知单

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml

@@ -11,18 +11,20 @@
 
     <select id="listPages" resultType="com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillVo">
         select wab.sid,
-               wab.billNo,
+        wab.billNo,
-               DATE_FORMAT(wab.createTime, '%Y-%m-%d')   as createTime,
+        DATE_FORMAT(wab.createTime, '%Y-%m-%d') as createTime,
-               wab.createByName,
+        wab.createByName,
-               wab.sourceBillNo,
+        wab.sourceBillNo,
-               wab.busTypeValue,
+        wab.busTypeValue,
-               wab.supplierName,
+        wab.supplierName,
-               wab.contact,
+        wab.contact,
-               wab.mobile,
+        wab.mobile,
-               DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
+        DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate,
-               case wab.billState when 0 then '新建' when 1 then '完成' end as billState,
+        case wab.billState when 0 then '在途' when 1 then '部分收货'
-               wab.reviewStatus,
+        when 2 then '已收货' when 3 then '已取消'
-               wab.refuseReason
+        end as billState,
+        wab.reviewStatus,
+        wab.refuseReason
         from wms_ans_bill wab
         <where>
             ${ew.sqlSegment}
@@ -47,10 +49,10 @@
     </select>
 
     <select id="selectNum" resultType="java.lang.String">
-        select RIGHT(billNo, 4)
+        select RIGHT (billNo, 4)
         from wms_ans_bill
         where billNo LIKE concat(#{bill}, '%')
         order by id desc
-        limit 1
+            limit 1
     </select>
-</mapper>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetail.java

@@ -35,9 +35,9 @@ public class WmsAnsBillDetail extends BaseEntity {
     @ApiModelProperty("预约数量（采购订单数量）")
     private String orderCount;
     @ApiModelProperty("待入库数量-根据收货单计算")
-    private Integer waitInCount;
+    private BigDecimal waitInCount;
     @ApiModelProperty("实际入库数量-根据收货单计算")
-    private Integer actualInCount;
+    private BigDecimal actualInCount;
     @ApiModelProperty("税额")
     private BigDecimal taxAmount;
     @ApiModelProperty("含税价")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.java

@@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsansbilldetail;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -15,4 +16,8 @@ public interface WmsAnsBillDetailMapper extends BaseMapper<WmsAnsBillDetail> {
     int deleteDetails(String sid);
 
     List<WmsAnsListDetailsVo> selectByBillSid(String sid);
+
+    String selGoodsCountBySpuSidAndSouceSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid);
+
+    WmsAnsBillDetail fetchBySpuSidAndBillSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml

@@ -19,8 +19,19 @@
                wd.cost,
                wd.taxAmount,
                wd.taxPrice,
-               wd.amount
+               wd.amount,
+               wd.goodsSkuSid,
+               wd.goodSpuSid
         from wms_ans_bill_detail wd
         where billSid = #{sid}
     </select>
-</mapper>
+    <select id="selGoodsCountBySpuSidAndSouceSid" resultType="java.lang.String">
+        SELECT IFNULL(d.orderCount,0) FROM wms_ans_bill_detail as d
+        WHERE d.goodSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
+    </select>
+    <select id="fetchBySpuSidAndBillSid"
+            resultType="com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail">
+        SELECT * FROM wms_ans_bill_detail as d
+        WHERE d.goodSpuSid = #{goodsSpuSid} and d.billSid = #{sourceBillSid}
+    </select>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailService.java

@@ -2,6 +2,7 @@ package com.yxt.wms.biz.inventory.wmsansbilldetail;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.common.base.service.MybatisBaseService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,4 +27,12 @@ public class WmsAnsBillDetailService extends MybatisBaseService<WmsAnsBillDetail
     public List<WmsAnsListDetailsVo> selectByBillSid(String sid) {
         return baseMapper.selectByBillSid(sid);
     }
+
+    public String selGoodsCountBySpuSidAndSouceSid(String goodsSpuSid,String sourceBillSid) {
+        return baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid,sourceBillSid);
+    }
+
+    public WmsAnsBillDetail fetchBySpuSidAndBillSid(String goodsSpuSid, String sourceBillSid) {
+        return baseMapper.fetchBySpuSidAndBillSid(goodsSpuSid,sourceBillSid);
+    }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java

@@ -32,10 +32,10 @@ public class WmsAnsListDetailsVo {
     private String orderCount;
     //待收货数量
     @ApiModelProperty("待入库数量-根据收货单计算")
-    private Integer waitInCount;
+    private String waitInCount;
     //已收货数量
     @ApiModelProperty("实际入库数量-根据收货单计算")
-    private Integer actualInCount;
+    private String actualInCount;
     //入库价
     @ApiModelProperty("单位成本（采购价）")
     private String cost;
@@ -46,14 +46,16 @@ public class WmsAnsListDetailsVo {
     //采购金额
     @ApiModelProperty("金额")
     private String amount;
-
+    @ApiModelProperty("商品Skusid")
-
+    private String goodsSkuSid;
- /*   @ApiModelProperty("商品基础信息sid")
+    @ApiModelProperty("商品基础信息sid")
     private String goodSpuSid;
+
+ /*
     @ApiModelProperty("商品名称")
     private String goodsSpuName;
-    @ApiModelProperty("商品Skusid")
+
-    private String goodsSkuSid;*/
+    */
 
 
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.java

@@ -4,9 +4,12 @@ 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 com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @description:
  * @author: dimengzhe
@@ -17,4 +20,10 @@ public interface WmsReceiptBillMapper extends BaseMapper<WmsReceiptBill> {
     IPage<WmsReceiptBillPageVo> listPage(IPage<WmsReceiptBill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsReceiptBill> qw);
 
     WmsReceiptBillInitVo getDetailsInit(String sid);
+
+    String selectNum(String bill);
+
+    String selGoodsCountBySpuSidAndSouceSid(@Param("goodsSpuSid") String goodsSpuSid, @Param("sourceBillSid") String sourceBillSid);
+
+    List<WmsReceiptBillDetail> selGoodsListCountBySpuSidAndSouceSid(@Param("goodsSpuSid")String goodsSpuSid, @Param("sourceBillSid")String sourceBillSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillMapper.xml

@@ -39,4 +39,28 @@
         from wms_receipt_bill wrb
         where wrb.sid = #{sid}
     </select>
-</mapper>
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (billNo, 4)
+        from wms_receipt_bill
+        where billNo LIKE concat(#{bill}, '%')
+        order by id desc
+            limit 1
+    </select>
+    <select id="selGoodsCountBySpuSidAndSouceSid" resultType="java.lang.String">
+        SELECT
+            IFNULL( SUM( d.actualInCount ), 0 )
+        FROM
+            wms_receipt_bill_detail AS d
+                LEFT JOIN wms_receipt_bill AS b ON d.billSid = b.sid
+        WHERE d.goodSpuSid = #{goodsSpuSid} AND b.sourceBillSid = #{sourceBillSid}
+    </select>
+    <select id="selGoodsListCountBySpuSidAndSouceSid"
+            resultType="com.yxt.wms.biz.inventory.wmsreceiptbilldetail.WmsReceiptBillDetail">
+        SELECT
+            *
+        FROM
+            wms_receipt_bill_detail AS d
+                LEFT JOIN wms_receipt_bill AS b ON d.billSid = b.sid
+        WHERE d.goodSpuSid = #{goodsSpuSid} AND b.sourceBillSid = #{sourceBillSid}
+    </select>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java

@@ -13,6 +13,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBill;
 import com.yxt.wms.biz.inventory.wmsansbill.WmsAnsBillService;
+import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetail;
 import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsBillDetailService;
 import com.yxt.wms.biz.inventory.wmsansbilldetail.WmsAnsListDetailsVo;
 import com.yxt.wms.biz.inventory.wmsreceiptbilldetail.*;
@@ -20,9 +21,14 @@ import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailB
 import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchDto2;
 import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchMapper;
 import com.yxt.wms.biz.inventory.wmsreceiptbilldetailbatch.WmsReceiptBillDetailBatchService;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
+import com.yxt.wms.utils.BillNo;
+import com.yxt.wms.utils.Rule;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -46,6 +52,8 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
     private WmsReceiptBillDetailMapper wmsReceiptBillDetailMapper;
     @Autowired
     private WmsReceiptBillDetailBatchMapper wmsReceiptBillDetailBatchMapper;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
     public PagerVo<WmsReceiptBillPageVo> listPage(PagerQuery<WmsReceiptBillQuery> pq) {
         WmsReceiptBillQuery query = pq.getParams();
@@ -106,6 +114,23 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         return rb.success().setData(sid);
     }
 
+    private String getApplyCode(String createOrgSid) {
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(createOrgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType("SHD");
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
     public ResultBean<String> saveOrUpdateBill2(WmsReceiptBillDto2 dto) {
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = dto.getSid();
@@ -118,13 +143,57 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             List<WmsReceiptBillDetailBatchDto2> pcList = dto.getPcList();
             pcList.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
+//                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
-            }
+                wmsReceiptBillDetailService.deleteByBillSid(sid);
-            if("0".equals(dto.getBillStateKey())){
+                for (WmsReceiptBillDetailDto2 detail : list) {
-                wmsReceiptBill.setBillState("0");
+                    WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
-            }else{
+                    BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
-                wmsReceiptBill.setBillState("1");
+                    wmsReceiptBillDetail.setBillSid(sid);
+                    wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
+                    String goodsSpuSid = detail.getGoodSpuSid();
+                    String sourceBillSid = dto.getSourceBillSid();
+//                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
+                    List<WmsReceiptBillDetail> details = baseMapper.selGoodsListCountBySpuSidAndSouceSid(goodsSpuSid,sourceBillSid);
+                    WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);
+                    BigDecimal count = new BigDecimal("0");
+                    if (!details.isEmpty()) {
+                        for (WmsReceiptBillDetail receiptBillDetail : details) {
+                          count = count.add(receiptBillDetail.getActualInCount());
+                        }
+                    }
+                    if (null != goods) {
+                        BigDecimal orderCount = new BigDecimal(goods.getOrderCount());
+                        goods.setActualInCount(count);
+                        goods.setWaitInCount(orderCount.subtract(count));
+                        wmsAnsBillDetailService.updateById(goods);
+                    }
+                }
+                WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
+                List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
+                if (!vos.isEmpty()) {
+                    HashSet<Integer> integers = new HashSet<>();
+                    for (WmsAnsListDetailsVo vo : vos) {
+                        BigDecimal count = new BigDecimal("0");
+                        if (StringUtils.isNotBlank(vo.getWaitInCount())) {
+                            count = new BigDecimal(vo.getWaitInCount());
+                        }
+                        if (count.compareTo(BigDecimal.ZERO) < 0) {
+                            integers.add(2);
+                        } else {
+                            integers.add(1);
+                        }
+                    }
+                    if (integers.size() > 1) {
+                        wmsAnsBill.setBillState(1);
+                    } else {
+                        wmsAnsBill.setBillState(2);
+                    }
+                }
+                wmsAnsBillService.updateById(wmsAnsBill);
             }
+            wmsReceiptBill.setBillState("0");
+            String applyCode = getApplyCode(dto.getCreateOrgSid());
+            wmsReceiptBill.setBillNo(applyCode);
             baseMapper.insert(wmsReceiptBill);
 
         } else {
@@ -138,12 +207,47 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
             List<WmsReceiptBillDetailBatchDto2> pcList = dto.getPcList();
             pcList.removeAll(Collections.singleton(null));
             if (!list.isEmpty()) {
-                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
+                wmsReceiptBillDetailService.deleteByBillSid(sid);
-            }
+//                wmsReceiptBillDetailService.saveOrUpdateDetailsList2(sid, list, pcList);
-            if("0".equals(dto.getBillStateKey())){
+                for (WmsReceiptBillDetailDto2 detail : list) {
-                wmsReceiptBill.setBillState("0");
+                    WmsReceiptBillDetail wmsReceiptBillDetail = new WmsReceiptBillDetail();
-            }else{
+                    BeanUtil.copyProperties(detail, wmsReceiptBillDetail, "sid");
-                wmsReceiptBill.setBillState("1");
+                    wmsReceiptBillDetail.setBillSid(sid);
+                    wmsReceiptBillDetailService.insert(wmsReceiptBillDetail);
+                    String goodsSpuSid = detail.getGoodSpuSid();
+                    String sourceBillSid = dto.getSourceBillSid();
+                    String goodsCount = baseMapper.selGoodsCountBySpuSidAndSouceSid(goodsSpuSid, sourceBillSid);
+                    WmsAnsBillDetail goods = wmsAnsBillDetailService.fetchBySpuSidAndBillSid(goodsSpuSid, sourceBillSid);
+                    BigDecimal count = new BigDecimal(goodsCount);
+                    if (null != goods) {
+                        BigDecimal orderCount = new BigDecimal(goods.getOrderCount());
+                        goods.setActualInCount(count);
+                        goods.setWaitInCount(orderCount.subtract(count));
+                        wmsAnsBillDetailService.updateById(goods);
+                    }
+                }
+                WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(dto.getSourceBillSid());
+                List<WmsAnsListDetailsVo> vos = wmsAnsBillDetailService.selectByBillSid(dto.getSourceBillSid());
+                if (!vos.isEmpty()) {
+                    HashSet<Integer> integers = new HashSet<>();
+                    for (WmsAnsListDetailsVo vo : vos) {
+                        BigDecimal count = new BigDecimal("0");
+                        if (StringUtils.isNotBlank(vo.getWaitInCount())) {
+                            count = new BigDecimal(vo.getWaitInCount());
+                        }
+                        if (count.compareTo(BigDecimal.ZERO) < 0) {
+                            integers.add(2);
+                        } else {
+                            integers.add(1);
+                        }
+                    }
+                    if (integers.size() > 1) {
+                        wmsAnsBill.setBillState(1);
+                    } else {
+                        wmsAnsBill.setBillState(2);
+                    }
+                }
+                wmsAnsBillService.updateById(wmsAnsBill);
             }
             baseMapper.updateById(wmsReceiptBill);
         }
@@ -154,21 +258,36 @@ public class WmsReceiptBillService extends MybatisBaseService<WmsReceiptBillMapp
         ResultBean<WmsReceiptBillVo> rb = ResultBean.fireFail();
         WmsReceiptBillVo wmsReceiptBillVo = new WmsReceiptBillVo();
         WmsAnsBill wmsAnsBill = wmsAnsBillService.fetchBySid(sourceSid);
-        BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid");
+        BeanUtil.copyProperties(wmsAnsBill, wmsReceiptBillVo, "sid", "billNo");
-        wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getSourceBillNo());
+        wmsReceiptBillVo.setSourceBillNo(wmsAnsBill.getBillNo());
         wmsReceiptBillVo.setSourceBillSid(wmsAnsBill.getSid());
         wmsReceiptBillVo.setCreateTime(DateUtil.today());
         if (wmsAnsBill.getBillState() == 0) {
             wmsReceiptBillVo.setBillStateKey("0");
-            wmsReceiptBillVo.setBillState("新建");
+            wmsReceiptBillVo.setBillState("在途");
-        } else {
+        } else if (wmsAnsBill.getBillState() == 1) {
-            wmsReceiptBillVo.setBillState("完成");
+            wmsReceiptBillVo.setBillState("部分收货");
             wmsReceiptBillVo.setBillStateKey("1");
+        } else if (wmsAnsBill.getBillState() == 2) {
+            wmsReceiptBillVo.setBillState("已收货");
+            wmsReceiptBillVo.setBillStateKey("2");
+        } else if (wmsAnsBill.getBillState() == 3) {
+            wmsReceiptBillVo.setBillState("已取消");
+            wmsReceiptBillVo.setBillStateKey("3");
         }
         List<WmsAnsListDetailsVo> list = wmsAnsBillDetailService.selectByBillSid(sourceSid);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
-            List<WmsReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList());
+//            List<WmsReceiptBillDetailVo> lists = Optional.ofNullable(list).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), WmsReceiptBillDetailVo.class)).collect(Collectors.toList());
+//            wmsReceiptBillVo.setList(lists);
+            List<WmsReceiptBillDetailVo> lists = new ArrayList<>();
+            for (WmsAnsListDetailsVo wmsAnsListDetailsVo : list) {
+                WmsReceiptBillDetailVo detailsVo = new WmsReceiptBillDetailVo();
+                BeanUtil.copyProperties(wmsAnsListDetailsVo, detailsVo);
+                detailsVo.setIsQuality(0);
+                detailsVo.setQualityState(0);
+                lists.add(detailsVo);
+            }
             wmsReceiptBillVo.setList(lists);
         }
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetail.java

@@ -47,12 +47,12 @@ public class WmsReceiptBillDetail extends BaseEntity {
     @ApiModelProperty("载具说明")
     private String packageRemark;
 
-    @ApiModelProperty("仓库sid")
+//    @ApiModelProperty("仓库sid")
-    private String warehouseSid;
+//    private String warehouseSid;
-    @ApiModelProperty("仓库名称")
+//    @ApiModelProperty("仓库名称")
-    private String warehouseName;
+//    private String warehouseName;
-    @ApiModelProperty("库位sid")
+//    @ApiModelProperty("库位sid")
-    private String warehouseRackSid;
+//    private String warehouseRackSid;
-    @ApiModelProperty("库位名称")
+//    @ApiModelProperty("库位名称")
-    private String warehouseRackName;
+//    private String warehouseRackName;
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailDto2.java

@@ -11,9 +11,12 @@ import lombok.Data;
  **/
 @Data
 public class WmsReceiptBillDetailDto2 {
-
+    @ApiModelProperty("商品名称")
+    private String goodsSpuName;
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
+    @ApiModelProperty("商品goodSpuSid")
+    private String goodSpuSid;
     @ApiModelProperty("商品Sku名称")
     private String goodsSkuTitle;
     @ApiModelProperty("商品sku编码")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailMapper.xml

@@ -13,10 +13,10 @@
                wrbd.goodsSkuCode,
                wrbd.goodsSkuOwnSpec,
                wrbd.unit,
-               wrbd.warehouseSid,
+--                wrbd.warehouseSid,
-               wrbd.warehouseName,
+--                wrbd.warehouseName,
-               wrbd.warehouseRackSid,
+--                wrbd.warehouseRackSid,
-               wrbd.warehouseRackName,
+--                wrbd.warehouseRackName,
                wrbd.actualInCount,
                wrbd.rejectCount,
                wrbd.rejectReason,
@@ -24,7 +24,8 @@
                wrbd.qualityState,
                wrbd.packageRemark,
                wrbd.state,
-               wrbd.sid detailsSid
+               wrbd.sid detailsSid,
+               wrbd.goodsSpuName
         from wms_receipt_bill_detail wrbd
         where billSid = #{sid}
     </select>
@@ -40,4 +41,4 @@
         </if>
 
     </select>
-</mapper>
+</mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailService.java

@@ -42,6 +42,10 @@ public class WmsReceiptBillDetailService extends MybatisBaseService<WmsReceiptBi
         });
     }
 
+    public int deleteByBillSid(String sid) {
+        return baseMapper.deleteByBillSid(sid);
+    }
+
     public void saveOrUpdateDetailsList2(String sid, List<WmsReceiptBillDetailDto2> list, List<WmsReceiptBillDetailBatchDto2> pcList) {
         baseMapper.deleteByBillSid(sid);
         list.forEach(v -> {
@@ -67,7 +71,7 @@ public class WmsReceiptBillDetailService extends MybatisBaseService<WmsReceiptBi
         return baseMapper.getDetailsInit(sid);
     }
 
-    public List<WmsReceiptBillDetail> selectByBillSid(String sid,List<String> sidList) {
+    public List<WmsReceiptBillDetail> selectByBillSid(String sid, List<String> sidList) {
-        return baseMapper.selectByBillSid(sid,sidList);
+        return baseMapper.selectByBillSid(sid, sidList);
     }
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbilldetail/WmsReceiptBillDetailVo.java

@@ -18,6 +18,8 @@ public class WmsReceiptBillDetailVo {
 
     @ApiModelProperty("商品Skusid")
     private String goodsSkuSid;
+    @ApiModelProperty("商品goodSpuSid")
+    private String goodSpuSid;
     @ApiModelProperty("商品Sku名称")
 //    private String goodsSkuTitle;
     private String goodsSpuName;

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -241,8 +241,8 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 ShelfInitListVo shelfInitListVo = new ShelfInitListVo();
                 BeanUtil.copyProperties(v, shelfInitListVo, "sid");
                 shelfInitListVo.setBatchNumber(wmsReceiptBillDetailBatch.getBatchNumber());
-                shelfInitListVo.setWarehouseSid(v.getWarehouseSid());
+//                shelfInitListVo.setWarehouseSid(v.getWarehouseSid());
-                shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid());
+//                shelfInitListVo.setWarehouseRackSid(v.getWarehouseRackSid());
                 shelfInitListVo.setWarehouseRackCode("");
                 list.add(shelfInitListVo);
             }