diff --git a/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java b/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java index aed875a..e4b9fab 100644 --- a/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java +++ b/src/main/java/com/gaotao/modules/shopOrder/entity/ProductMixInShopOrder.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; +import java.math.BigDecimal; import java.util.Date; public class ProductMixInShopOrder { @@ -33,6 +34,15 @@ public class ProductMixInShopOrder { private String partUmName; private String outboundWarehouseId; private String outboundWarehouseName; + private BigDecimal qtyReturn; + + public BigDecimal getQtyReturn() { + return qtyReturn; + } + + public void setQtyReturn(BigDecimal qtyReturn) { + this.qtyReturn = qtyReturn; + } public String getOutboundWarehouseId() { return outboundWarehouseId; diff --git a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml index 5af4338..e428a97 100644 --- a/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml +++ b/src/main/resources/mapper/shopOrder/ShopOrderMapper.xml @@ -665,7 +665,8 @@ B.RMType_DB, b.IssueType as issueMethod, B.outbound_warehouse_id, - w.WareHouseName as outboundWarehouseName + w.WareHouseName as outboundWarehouseName, + B.qtyReturn FROM dbo.view_SAP_SOBOM AS B left join Part as P on B.Site = P.Site and B.ComponentPartNo = P.PartNo left join um as um on p.site = um.site and p.umid = um.umid