8/7

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/PurchaseInventoryBillRest.java

@@ -38,8 +38,8 @@ public class PurchaseInventoryBillRest {
 
 
     @ApiOperation("采购入库单据编辑初始化/详情")
-    @GetMapping("/selectByBillSid")
-    ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(@RequestParam("sid") String sid) {
+    @GetMapping("/selectByBillSid/{sid}")
+    ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(@PathVariable("sid") String sid) {
         return purchaseInventoryBillService.selectByBillSid(sid);
     }
 

wms/src/main/java/com/yxt/wms/apiadmin/aggregation/WarehouseAnsBillRest.java

@@ -34,7 +34,7 @@ public class WarehouseAnsBillRest {
         return warehouseAnsBillService.saveOrUpdateBill(dto);
     }
 
-   @PostMapping("pageList")
+   @PostMapping("/listPageAns")
     @ApiOperation("收货单据选择")
     ResultBean<PagerVo<WarehouseAndBillDetailVo>> pageList(@RequestBody PagerQuery<WarehouseAnsBillQuery> pagerQuery) {
         return  warehouseAnsBillService.listPageAns(pagerQuery);

wms/src/main/java/com/yxt/wms/biz/func/purchaseinventorybill/PurchaseInventoryBillQuery.java

@@ -30,8 +30,8 @@ public class PurchaseInventoryBillQuery implements Query {
     private String waybillNumber;
     @ApiModelProperty("商品sid")
     private String goodsSkuSid;
-    @ApiModelProperty("货主")
-    private String shipper;
+    @ApiModelProperty("供应商")
+    private String supplierName;
     @ApiModelProperty("菜单路由")
     private String menuUrl;
     @ApiModelProperty("组织全路径sid")

wms/src/main/java/com/yxt/wms/biz/func/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 String unitName;
+    @ApiModelProperty("成本单价")
+    private double price;
+    @ApiModelProperty("总价")
+    private double totalPrice;
+    @ApiModelProperty("数量")
+    private double count;
+    @ApiModelProperty("辅助单位")
+    private String auxiliaryUnits;
+    @ApiModelProperty("序列号")
+    private String 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;
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAndBillDetailVo.java

@@ -61,5 +61,6 @@ public class WarehouseAndBillDetailVo {
     private String carrier;
     @ApiModelProperty("运单号")
     private String waybillNumber;
+    private boolean check=false;
     List<WarehouseAnsBillDetail> warehouseAnsBillDetails =new ArrayList<>();
 }

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbill/WarehouseAnsBillQuery.java

@@ -28,6 +28,7 @@ public class WarehouseAnsBillQuery implements Query {
     private String billState;
     @ApiModelProperty("供应商")
     private String supplierName;
+    private String supplierSid;
     @ApiModelProperty("运单号")
     private String waybillNumber;
     @ApiModelProperty("承运商")

wms/src/main/java/com/yxt/wms/biz/func/warehouseansbilldetail/WarehouseAnsBillDetail.java

@@ -1,5 +1,6 @@
 package com.yxt.wms.biz.func.warehouseansbilldetail;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.yxt.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -13,7 +14,7 @@ import lombok.Data;
 public class WarehouseAnsBillDetail extends BaseEntity {
 
     @ApiModelProperty("来源单sid")
-    private String billSid;
+    private String sourceBillSid;
     @ApiModelProperty("图示")
     private String illustration;
     @ApiModelProperty("商品Skusid")
@@ -32,4 +33,6 @@ public class WarehouseAnsBillDetail extends BaseEntity {
     private Integer waitInCount;
     @ApiModelProperty("实际入库数量-根据收货单计算")
     private Integer actualInCount;
+    @TableField(exist = false)
+    private boolean check=false;
 }

wms/src/main/java/com/yxt/wms/feign/warehouse/purchaseinventorybill/PurchaseInventoryBillFeign.java

@@ -34,8 +34,8 @@ public interface PurchaseInventoryBillFeign {
 
 
     @ApiOperation("采购入库单据编辑初始化/详情")
-    @GetMapping("/selectByBillSid")
-    ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(@RequestParam("sid") String sid);
+    @GetMapping("/selectByBillSid/{sid}")
+    ResultBean<PurchaseInventoryBillInitVo> selectByBillSid(@PathVariable("sid") String sid);
 
     @ApiOperation("确认")
     @PostMapping("/confirm")