diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java index eb472b459e..5d205434bf 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBill.java @@ -24,7 +24,7 @@ public class WmsAnsBill extends BaseEntity { private String busTypeValue; @ApiModelProperty("制单人姓名") private String createByName; - @ApiModelProperty("货物状态(在途、部分收货、已收货、已取消)") + @ApiModelProperty("货物状态") private Integer billState; @ApiModelProperty("审核状态(待审核、审核通过、审核拒绝)") private String reviewStatus; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml index 436a8ab336..b639781547 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbill/WmsAnsBillMapper.xml @@ -20,7 +20,7 @@ wab.contact, wab.mobile, DATE_FORMAT(wab.deliveryDate, '%Y-%m-%d') as deliveryDate, - wab.billState, + case wab.billState when 0 then '新建' when 1 then '完成' end as billState, wab.reviewStatus, wab.refuseReason from wms_ans_bill wab diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml index 30609e67d5..513761c370 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsBillDetailMapper.xml @@ -11,6 +11,7 @@ select wd.goodsSkuTitle, wd.goodsSkuCode, wd.goodsSkuOwnSpec, + wd.goodsSpuName, wd.unit, wd.orderCount, wd.waitInCount, diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java index 2476e8aa09..56aa388fcc 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsansbilldetail/WmsAnsListDetailsVo.java @@ -13,7 +13,8 @@ import java.math.BigDecimal; @Data public class WmsAnsListDetailsVo { @ApiModelProperty("商品名称") - private String goodsSkuTitle; +// private String goodsSkuTitle; + private String goodsSpuName; @ApiModelProperty("商品编码(图号)") private String goodsSkuCode; @ApiModelProperty("规格型号") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java index 4ffdce76c0..4b15008feb 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillService.java @@ -148,6 +148,13 @@ public class WmsReceiptBillService extends MybatisBaseService list = wmsAnsBillDetailService.selectByBillSid(sourceSid); list.removeAll(Collections.singleton(null)); if (!list.isEmpty()) { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java index 8d36a5f69f..be8380b647 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsreceiptbill/WmsReceiptBillVo.java @@ -39,8 +39,9 @@ public class WmsReceiptBillVo { @ApiModelProperty("到货日期") private Date deliveryDate; //单据状态:新建/已完成 - @ApiModelProperty("单据状态:待收货/部分收货/已收货(默认)") + @ApiModelProperty("单据状态") private String billState; + private String billStateKey; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("使用组织sid")