Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoods.java

@@ -121,6 +121,9 @@ public class InspectGoods extends BaseEntity {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endDateTime;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<InspectGoodsDetail> inspectGoodsDetails;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/InspectGoodsDetail.java

@@ -82,4 +82,7 @@ public class InspectGoodsDetail extends BaseEntity {
     @ApiModelProperty(value = "材料名称")
     private String materialName;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/PurchasePlan.java

@@ -1,5 +1,6 @@
 package com.bonus.canteen.core.ims.domain;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -84,6 +85,10 @@ public class PurchasePlan extends BaseEntity {
     @ApiModelProperty(value = "档口id")
     private String stallId;
 
+    @Excel(name = "预计采购数量")
+    @ApiModelProperty(value = "预计采购数量")
+    private BigDecimal totalNum;
+
     /** 预计采购预算 */
     @Excel(name = "预计采购预算")
     @ApiModelProperty(value = "预计采购预算")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsAdd.java

@@ -108,6 +108,9 @@ public class InspectGoodsAdd implements Serializable {
     @ApiModelProperty(value = "送货供应商名称")
     private String deliverySupplierName;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<InspectGoodsDetailAdd> inspectGoodsDetails;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsDetailAdd.java

@@ -71,4 +71,7 @@ public class InspectGoodsDetailAdd implements Serializable {
     @ApiModelProperty(value = "材料名称")
     private String materialName;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsDetailUpdate.java

@@ -67,4 +67,7 @@ public class InspectGoodsDetailUpdate implements Serializable {
     @ApiModelProperty(value = "验货图片")
     private String checkPicUrls;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/InspectGoodsUpdate.java

@@ -107,6 +107,9 @@ public class InspectGoodsUpdate implements Serializable {
     @ApiModelProperty(value = "签名图片")
     private String signaturePicUrl;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<InspectGoodsDetailUpdate> inspectGoodsDetails;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/OrderGoodsAdd.java

@@ -139,6 +139,9 @@ public class OrderGoodsAdd implements Serializable {
     @ApiModelProperty(value = "是否全部验货(1是2否)")
     private Long ifAllInspect;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<OrderGoodsDetailAdd> orderGoodsDetailList;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/OrderGoodsUpdate.java

@@ -142,6 +142,9 @@ public class OrderGoodsUpdate implements Serializable {
     @ApiModelProperty(value = "是否全部验货(1是2否)")
     private Long ifAllInspect;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<OrderGoodsDetailUpdate> orderGoodsDetailList;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchaseContractAdd.java

@@ -145,6 +145,9 @@ public class PurchaseContractAdd implements Serializable {
     @ApiModelProperty(value = "负责人")
     private String contractPerson;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<PurchaseContractDetailAdd> purchaseContractDetailList;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchaseContractUpdate.java

@@ -143,6 +143,9 @@ public class PurchaseContractUpdate implements Serializable {
     @ApiModelProperty(value = "负责人")
     private String contractPerson;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<PurchaseContractDetailUpdate> purchaseContractDetailList;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanAdd.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -72,6 +73,10 @@ public class PurchasePlanAdd implements Serializable {
     @ApiModelProperty(value = "档口id")
     private String stallId;
 
+    @Excel(name = "预计采购数量")
+    @ApiModelProperty(value = "预计采购数量")
+    private BigDecimal totalNum;
+
     /** 预计采购预算 */
     @Excel(name = "预计采购预算")
     @ApiModelProperty(value = "预计采购预算")
@@ -98,6 +103,9 @@ public class PurchasePlanAdd implements Serializable {
     @ApiModelProperty(value = "审批备注")
     private String approveRemark;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     /** 是否合并(1是2否) */
     @Excel(name = "是否合并(1是2否)")
     @ApiModelProperty(value = "是否合并(1是2否)")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/param/PurchasePlanUpdate.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -73,6 +74,10 @@ public class PurchasePlanUpdate implements Serializable {
     @ApiModelProperty(value = "档口id")
     private String stallId;
 
+    @Excel(name = "预计采购数量")
+    @ApiModelProperty(value = "预计采购数量")
+    private BigDecimal totalNum;
+
     /** 预计采购预算 */
     @Excel(name = "预计采购预算")
     @ApiModelProperty(value = "预计采购预算")
@@ -104,6 +109,9 @@ public class PurchasePlanUpdate implements Serializable {
     @ApiModelProperty(value = "是否合并(1是2否)")
     private Long ifMerge;
 
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     /** 交货日期 */
     @ApiModelProperty(value = "交货日期")
     @JsonFormat(pattern = "yyyy-MM-dd")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsDetailVO.java

@@ -83,4 +83,23 @@ public class InspectGoodsDetailVO extends BaseEntity {
     @ApiModelProperty(value = "材料名称")
     private String materialName;
 
+    @Excel(name = "计量单位名称")
+    @ApiModelProperty(value = "计量单位名称")
+    private String unitName;
+
+    @Excel(name = "货品编码")
+    @ApiModelProperty(value = "货品编码")
+    private String materialCode;
+
+    @Excel(name = "货品类型")
+    @ApiModelProperty(value = "货品类型")
+    private String materialTypeName;
+
+    @Excel(name = "货品规格")
+    @ApiModelProperty(value = "货品规格")
+    private String size;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/InspectGoodsVO.java

@@ -113,6 +113,13 @@ public class InspectGoodsVO extends BaseEntity {
     @ApiModelProperty(value = "送货供应商名称")
     private String deliverySupplierName;
 
+    @Excel(name = "区域ID")
+    @ApiModelProperty(value = "区域ID")
+    private Long areaId;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
     private List<InspectGoodsDetailVO> inspectGoodsDetails;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/OrderGoodsDetailVO.java

@@ -87,4 +87,12 @@ public class OrderGoodsDetailVO extends BaseEntity {
     @ApiModelProperty(value = "计量单位名称")
     private String unitName;
 
+    @Excel(name = "货品编码")
+    @ApiModelProperty(value = "货品编码")
+    private String materialCode;
+
+    @Excel(name = "货品类型")
+    @ApiModelProperty(value = "货品类型")
+    private String materialTypeName;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractDetailVO.java

@@ -70,5 +70,12 @@ public class PurchaseContractDetailVO extends BaseEntity {
     @ApiModelProperty(value = "计量单位名称")
     private String unitName;
 
+    @Excel(name = "货品编码")
+    @ApiModelProperty(value = "货品编码")
+    private String materialCode;
+
+    @Excel(name = "货品类型")
+    @ApiModelProperty(value = "货品类型")
+    private String materialTypeName;
 
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchaseContractVO.java

@@ -183,6 +183,11 @@ public class PurchaseContractVO extends BaseEntity {
     @ApiModelProperty(value = "供应商名称")
     private String supplierName;
 
+    /** 合同附件，多个则逗号分隔 */
+    @Excel(name = "合同附件，多个则逗号分隔")
+    @ApiModelProperty(value = "合同附件，多个则逗号分隔")
+    private String contractAttachment;
+
     @ApiModelProperty(value = "合同附件")
     private List<String> contractAttachmentList;
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchasePlanDetailVO.java

@@ -96,4 +96,12 @@ public class PurchasePlanDetailVO extends BaseEntity {
     @ApiModelProperty(value = "材料名称")
     private String stallName;
 
+    @Excel(name = "货品编码")
+    @ApiModelProperty(value = "货品编码")
+    private String materialCode;
+
+    @Excel(name = "货品类型")
+    @ApiModelProperty(value = "货品类型")
+    private String materialTypeName;
+
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/vo/PurchasePlanVO.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -137,5 +138,9 @@ public class PurchasePlanVO extends BaseEntity {
     @ApiModelProperty(value = "供应商名称")
     private String supplierNames;
 
+    @Excel(name = "预计采购数量")
+    @ApiModelProperty(value = "预计采购数量")
+    private BigDecimal totalNum;
+
     private List<PurchasePlanDetailVO> purchasePlanDetailList;
 }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InspectGoodsDetailMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.InspectGoodsDetail;
+import com.bonus.canteen.core.ims.domain.vo.InspectGoodsDetailVO;
 
 /**
  * 验货单明细Mapper接口
@@ -16,7 +17,7 @@ public interface InspectGoodsDetailMapper {
      * @param inspectGoodsDetailId 验货单明细主键
      * @return 验货单明细
      */
-    public InspectGoodsDetail selectInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId);
+    public InspectGoodsDetailVO selectInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId);
 
     /**
      * 查询验货单明细列表
@@ -24,7 +25,7 @@ public interface InspectGoodsDetailMapper {
      * @param inspectGoodsDetail 验货单明细
      * @return 验货单明细集合
      */
-    public List<InspectGoodsDetail> selectInspectGoodsDetailList(InspectGoodsDetail inspectGoodsDetail);
+    public List<InspectGoodsDetailVO> selectInspectGoodsDetailList(InspectGoodsDetail inspectGoodsDetail);
 
     /**
      * 新增验货单明细

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/InspectGoodsMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.InspectGoods;
+import com.bonus.canteen.core.ims.domain.vo.InspectGoodsVO;
 
 /**
  * 验货单Mapper接口
@@ -16,7 +17,7 @@ public interface InspectGoodsMapper {
      * @param inspectGoodsId 验货单主键
      * @return 验货单
      */
-    public InspectGoods selectInspectGoodsByInspectGoodsId(Long inspectGoodsId);
+    public InspectGoodsVO selectInspectGoodsByInspectGoodsId(Long inspectGoodsId);
 
     /**
      * 查询验货单列表
@@ -24,7 +25,7 @@ public interface InspectGoodsMapper {
      * @param inspectGoods 验货单
      * @return 验货单集合
      */
-    public List<InspectGoods> selectInspectGoodsList(InspectGoods inspectGoods);
+    public List<InspectGoodsVO> selectInspectGoodsList(InspectGoods inspectGoods);
 
     /**
      * 新增验货单

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/OrderGoodsDetailMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.OrderGoodsDetail;
+import com.bonus.canteen.core.ims.domain.vo.OrderGoodsDetailVO;
 
 /**
  * 采购订单明细Mapper接口
@@ -16,7 +17,7 @@ public interface OrderGoodsDetailMapper {
      * @param orderGoodsDetailId 采购订单明细主键
      * @return 采购订单明细
      */
-    public OrderGoodsDetail selectOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId);
+    public OrderGoodsDetailVO selectOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId);
 
     /**
      * 查询采购订单明细列表
@@ -24,7 +25,7 @@ public interface OrderGoodsDetailMapper {
      * @param orderGoodsDetail 采购订单明细
      * @return 采购订单明细集合
      */
-    public List<OrderGoodsDetail> selectOrderGoodsDetailList(OrderGoodsDetail orderGoodsDetail);
+    public List<OrderGoodsDetailVO> selectOrderGoodsDetailList(OrderGoodsDetail orderGoodsDetail);
 
     /**
      * 新增采购订单明细

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/OrderGoodsMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.OrderGoods;
+import com.bonus.canteen.core.ims.domain.vo.OrderGoodsVO;
 
 /**
  * 采购订单主Mapper接口
@@ -16,7 +17,7 @@ public interface OrderGoodsMapper {
      * @param orderGoodsId 采购订单主主键
      * @return 采购订单主
      */
-    public OrderGoods selectOrderGoodsByOrderGoodsId(Long orderGoodsId);
+    public OrderGoodsVO selectOrderGoodsByOrderGoodsId(Long orderGoodsId);
 
     /**
      * 查询采购订单主列表
@@ -24,7 +25,7 @@ public interface OrderGoodsMapper {
      * @param orderGoods 采购订单主
      * @return 采购订单主集合
      */
-    public List<OrderGoods> selectOrderGoodsList(OrderGoods orderGoods);
+    public List<OrderGoodsVO> selectOrderGoodsList(OrderGoods orderGoods);
 
     /**
      * 新增采购订单主

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchaseContractDetailMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.PurchaseContractDetail;
+import com.bonus.canteen.core.ims.domain.vo.PurchaseContractDetailVO;
 
 /**
  * 采购合同明细Mapper接口
@@ -16,7 +17,7 @@ public interface PurchaseContractDetailMapper {
      * @param contractDetailId 采购合同明细主键
      * @return 采购合同明细
      */
-    public PurchaseContractDetail selectPurchaseContractDetailByContractDetailId(Long contractDetailId);
+    public PurchaseContractDetailVO selectPurchaseContractDetailByContractDetailId(Long contractDetailId);
 
     /**
      * 查询采购合同明细列表
@@ -24,7 +25,7 @@ public interface PurchaseContractDetailMapper {
      * @param purchaseContractDetail 采购合同明细
      * @return 采购合同明细集合
      */
-    public List<PurchaseContractDetail> selectPurchaseContractDetailList(PurchaseContractDetail purchaseContractDetail);
+    public List<PurchaseContractDetailVO> selectPurchaseContractDetailList(PurchaseContractDetail purchaseContractDetail);
 
     /**
      * 新增采购合同明细

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchaseContractMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.PurchaseContract;
+import com.bonus.canteen.core.ims.domain.vo.PurchaseContractVO;
 
 /**
  * 采购合同主Mapper接口
@@ -16,7 +17,7 @@ public interface PurchaseContractMapper {
      * @param contractId 采购合同主主键
      * @return 采购合同主
      */
-    public PurchaseContract selectPurchaseContractByContractId(Long contractId);
+    public PurchaseContractVO selectPurchaseContractByContractId(Long contractId);
 
     /**
      * 查询采购合同主列表
@@ -24,7 +25,7 @@ public interface PurchaseContractMapper {
      * @param purchaseContract 采购合同主
      * @return 采购合同主集合
      */
-    public List<PurchaseContract> selectPurchaseContractList(PurchaseContract purchaseContract);
+    public List<PurchaseContractVO> selectPurchaseContractList(PurchaseContract purchaseContract);
 
     /**
      * 新增采购合同主

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchasePlanDetailMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.PurchasePlanDetail;
+import com.bonus.canteen.core.ims.domain.vo.PurchasePlanDetailVO;
 
 /**
  * 采购计划详情Mapper接口
@@ -16,7 +17,7 @@ public interface PurchasePlanDetailMapper {
      * @param detailId 采购计划详情主键
      * @return 采购计划详情
      */
-    public PurchasePlanDetail selectPurchasePlanDetailByDetailId(Long detailId);
+    public PurchasePlanDetailVO selectPurchasePlanDetailByDetailId(Long detailId);
 
     /**
      * 查询采购计划详情列表
@@ -24,7 +25,7 @@ public interface PurchasePlanDetailMapper {
      * @param purchasePlanDetail 采购计划详情
      * @return 采购计划详情集合
      */
-    public List<PurchasePlanDetail> selectPurchasePlanDetailList(PurchasePlanDetail purchasePlanDetail);
+    public List<PurchasePlanDetailVO> selectPurchasePlanDetailList(PurchasePlanDetail purchasePlanDetail);
 
     /**
      * 新增采购计划详情

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/mapper/PurchasePlanMapper.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.mapper;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.PurchasePlan;
+import com.bonus.canteen.core.ims.domain.vo.PurchasePlanVO;
 
 /**
  * 采购计划Mapper接口
@@ -16,7 +17,7 @@ public interface PurchasePlanMapper {
      * @param planId 采购计划主键
      * @return 采购计划
      */
-    public PurchasePlan selectPurchasePlanByPlanId(Long planId);
+    public PurchasePlanVO selectPurchasePlanByPlanId(Long planId);
 
     /**
      * 查询采购计划列表
@@ -24,7 +25,7 @@ public interface PurchasePlanMapper {
      * @param purchasePlan 采购计划
      * @return 采购计划集合
      */
-    public List<PurchasePlan> selectPurchasePlanList(PurchasePlan purchasePlan);
+    public List<PurchasePlanVO> selectPurchasePlanList(PurchasePlan purchasePlan);
 
     /**
      * 新增采购计划

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IInspectGoodsDetailService.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.InspectGoodsDetail;
+import com.bonus.canteen.core.ims.domain.vo.InspectGoodsDetailVO;
 
 /**
  * 验货单明细Service接口
@@ -16,7 +17,7 @@ public interface IInspectGoodsDetailService {
      * @param inspectGoodsDetailId 验货单明细主键
      * @return 验货单明细
      */
-    public InspectGoodsDetail selectInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId);
+    public InspectGoodsDetailVO selectInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId);
 
     /**
      * 查询验货单明细列表
@@ -24,7 +25,7 @@ public interface IInspectGoodsDetailService {
      * @param inspectGoodsDetail 验货单明细
      * @return 验货单明细集合
      */
-    public List<InspectGoodsDetail> selectInspectGoodsDetailList(InspectGoodsDetail inspectGoodsDetail);
+    public List<InspectGoodsDetailVO> selectInspectGoodsDetailList(InspectGoodsDetail inspectGoodsDetail);
 
     /**
      * 新增验货单明细

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IOrderGoodsDetailService.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.OrderGoodsDetail;
+import com.bonus.canteen.core.ims.domain.vo.OrderGoodsDetailVO;
 
 /**
  * 采购订单明细Service接口
@@ -16,7 +17,7 @@ public interface IOrderGoodsDetailService {
      * @param orderGoodsDetailId 采购订单明细主键
      * @return 采购订单明细
      */
-    public OrderGoodsDetail selectOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId);
+    public OrderGoodsDetailVO selectOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId);
 
     /**
      * 查询采购订单明细列表
@@ -24,7 +25,7 @@ public interface IOrderGoodsDetailService {
      * @param orderGoodsDetail 采购订单明细
      * @return 采购订单明细集合
      */
-    public List<OrderGoodsDetail> selectOrderGoodsDetailList(OrderGoodsDetail orderGoodsDetail);
+    public List<OrderGoodsDetailVO> selectOrderGoodsDetailList(OrderGoodsDetail orderGoodsDetail);
 
     /**
      * 新增采购订单明细

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchaseContractDetailService.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.PurchaseContractDetail;
+import com.bonus.canteen.core.ims.domain.vo.PurchaseContractDetailVO;
 
 /**
  * 采购合同明细Service接口
@@ -16,7 +17,7 @@ public interface IPurchaseContractDetailService {
      * @param contractDetailId 采购合同明细主键
      * @return 采购合同明细
      */
-    public PurchaseContractDetail selectPurchaseContractDetailByContractDetailId(Long contractDetailId);
+    public PurchaseContractDetailVO selectPurchaseContractDetailByContractDetailId(Long contractDetailId);
 
     /**
      * 查询采购合同明细列表
@@ -24,7 +25,7 @@ public interface IPurchaseContractDetailService {
      * @param purchaseContractDetail 采购合同明细
      * @return 采购合同明细集合
      */
-    public List<PurchaseContractDetail> selectPurchaseContractDetailList(PurchaseContractDetail purchaseContractDetail);
+    public List<PurchaseContractDetailVO> selectPurchaseContractDetailList(PurchaseContractDetail purchaseContractDetail);
 
     /**
      * 新增采购合同明细

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/IPurchasePlanDetailService.java

@@ -2,6 +2,7 @@ package com.bonus.canteen.core.ims.service;
 
 import java.util.List;
 import com.bonus.canteen.core.ims.domain.PurchasePlanDetail;
+import com.bonus.canteen.core.ims.domain.vo.PurchasePlanDetailVO;
 
 /**
  * 采购计划详情Service接口
@@ -16,7 +17,7 @@ public interface IPurchasePlanDetailService {
      * @param detailId 采购计划详情主键
      * @return 采购计划详情
      */
-    public PurchasePlanDetail selectPurchasePlanDetailByDetailId(Long detailId);
+    public PurchasePlanDetailVO selectPurchasePlanDetailByDetailId(Long detailId);
 
     /**
      * 查询采购计划详情列表
@@ -24,7 +25,7 @@ public interface IPurchasePlanDetailService {
      * @param purchasePlanDetail 采购计划详情
      * @return 采购计划详情集合
      */
-    public List<PurchasePlanDetail> selectPurchasePlanDetailList(PurchasePlanDetail purchasePlanDetail);
+    public List<PurchasePlanDetailVO> selectPurchasePlanDetailList(PurchasePlanDetail purchasePlanDetail);
 
     /**
      * 新增采购计划详情

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.ims.service.impl;
 
 import java.util.List;
+
+import com.bonus.canteen.core.ims.domain.vo.InspectGoodsDetailVO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@ public class InspectGoodsDetailServiceImpl implements IInspectGoodsDetailService
      * @return 验货单明细
      */
     @Override
-    public InspectGoodsDetail selectInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId) {
+    public InspectGoodsDetailVO selectInspectGoodsDetailByInspectGoodsDetailId(Long inspectGoodsDetailId) {
         return inspectGoodsDetailMapper.selectInspectGoodsDetailByInspectGoodsDetailId(inspectGoodsDetailId);
     }
 
@@ -38,7 +40,7 @@ public class InspectGoodsDetailServiceImpl implements IInspectGoodsDetailService
      * @return 验货单明细
      */
     @Override
-    public List<InspectGoodsDetail> selectInspectGoodsDetailList(InspectGoodsDetail inspectGoodsDetail) {
+    public List<InspectGoodsDetailVO> selectInspectGoodsDetailList(InspectGoodsDetail inspectGoodsDetail) {
         return inspectGoodsDetailMapper.selectInspectGoodsDetailList(inspectGoodsDetail);
     }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/InspectGoodsServiceImpl.java

@@ -49,24 +49,12 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService {
      */
     @Override
     public InspectGoodsVO selectInspectGoodsByInspectGoodsId(Long inspectGoodsId) {
-        InspectGoods inspectGoods = inspectGoodsMapper.selectInspectGoodsByInspectGoodsId(inspectGoodsId);
+        InspectGoodsVO inspectGoodsVO = inspectGoodsMapper.selectInspectGoodsByInspectGoodsId(inspectGoodsId);
-        InspectGoodsVO inspectGoodsVO = null;
+        if(Objects.nonNull(inspectGoodsVO)) {
-        if(Objects.nonNull(inspectGoods)) {
             InspectGoodsDetail inspectGoodsDetail = new InspectGoodsDetail();
             inspectGoodsDetail.setInspectGoodsId(inspectGoodsId);
-            List<InspectGoodsDetail> inspectGoodsDetails = inspectGoodsDetailService.selectInspectGoodsDetailList(inspectGoodsDetail);
+            List<InspectGoodsDetailVO> inspectGoodsDetails = inspectGoodsDetailService.selectInspectGoodsDetailList(inspectGoodsDetail);
-            inspectGoods.setInspectGoodsDetails(inspectGoodsDetails);
+            inspectGoodsVO.setInspectGoodsDetails(inspectGoodsDetails);
-            inspectGoodsVO = new InspectGoodsVO();
-            BeanUtils.copyProperties(inspectGoods, inspectGoodsVO);
-            if(CollUtil.isNotEmpty(inspectGoodsDetails)) {
-                List<InspectGoodsDetailVO> orderGoodsDetailVOList = new ArrayList<>();
-                inspectGoodsDetails.forEach(detail -> {
-                    InspectGoodsDetailVO inspectGoodsDetailVO = new InspectGoodsDetailVO();
-                    BeanUtils.copyProperties(detail, inspectGoodsDetailVO);
-                    orderGoodsDetailVOList.add(inspectGoodsDetailVO);
-                });
-                inspectGoodsVO.setInspectGoodsDetails(orderGoodsDetailVOList);
-            }
         }
         return inspectGoodsVO;
     }
@@ -79,19 +67,7 @@ public class InspectGoodsServiceImpl implements IInspectGoodsService {
      */
     @Override
     public List<InspectGoodsVO> selectInspectGoodsList(InspectGoods inspectGoods) {
-        List<InspectGoods> inspectGoodsList = inspectGoodsMapper.selectInspectGoodsList(inspectGoods);
+        return inspectGoodsMapper.selectInspectGoodsList(inspectGoods);
-        List<InspectGoodsVO> inspectGoodsVOList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(inspectGoodsList)) {
-            for(InspectGoods goods : inspectGoodsList) {
-                InspectGoodsDetail inspectGoodsDetail = new InspectGoodsDetail();
-                inspectGoodsDetail.setInspectGoodsId(goods.getInspectGoodsId());
-//                goods.setInspectGoodsDetails(inspectGoodsDetailService.selectInspectGoodsDetailList(inspectGoodsDetail));
-                InspectGoodsVO inspectGoodsVO = new InspectGoodsVO();
-                BeanUtils.copyProperties(goods, inspectGoodsVO);
-                inspectGoodsVOList.add(inspectGoodsVO);
-            }
-        }
-        return inspectGoodsVOList;
     }
 
     /**

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.ims.service.impl;
 
 import java.util.List;
+
+import com.bonus.canteen.core.ims.domain.vo.OrderGoodsDetailVO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@ public class OrderGoodsDetailServiceImpl implements IOrderGoodsDetailService {
      * @return 采购订单明细
      */
     @Override
-    public OrderGoodsDetail selectOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId) {
+    public OrderGoodsDetailVO selectOrderGoodsDetailByOrderGoodsDetailId(Long orderGoodsDetailId) {
         return orderGoodsDetailMapper.selectOrderGoodsDetailByOrderGoodsDetailId(orderGoodsDetailId);
     }
 
@@ -38,7 +40,7 @@ public class OrderGoodsDetailServiceImpl implements IOrderGoodsDetailService {
      * @return 采购订单明细
      */
     @Override
-    public List<OrderGoodsDetail> selectOrderGoodsDetailList(OrderGoodsDetail orderGoodsDetail) {
+    public List<OrderGoodsDetailVO> selectOrderGoodsDetailList(OrderGoodsDetail orderGoodsDetail) {
         return orderGoodsDetailMapper.selectOrderGoodsDetailList(orderGoodsDetail);
     }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/OrderGoodsServiceImpl.java

@@ -48,24 +48,12 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService {
      */
     @Override
     public OrderGoodsVO selectOrderGoodsByOrderGoodsId(Long orderGoodsId) {
-        OrderGoods orderGoods = orderGoodsMapper.selectOrderGoodsByOrderGoodsId(orderGoodsId);
+        OrderGoodsVO orderGoodsVO = orderGoodsMapper.selectOrderGoodsByOrderGoodsId(orderGoodsId);
-        OrderGoodsVO orderGoodsVO = null;
+        if(Objects.nonNull(orderGoodsVO)) {
-        if(Objects.nonNull(orderGoods)) {
             OrderGoodsDetail orderGoodsDetail = new OrderGoodsDetail();
-            orderGoodsDetail.setOrderGoodsId(orderGoods.getOrderGoodsId());
+            orderGoodsDetail.setOrderGoodsId(orderGoodsVO.getOrderGoodsId());
-            List<OrderGoodsDetail> orderGoodsDetails = inspectGoodsDetailService.selectOrderGoodsDetailList(orderGoodsDetail);
+            List<OrderGoodsDetailVO> orderGoodsDetails = inspectGoodsDetailService.selectOrderGoodsDetailList(orderGoodsDetail);
-            orderGoods.setOrderGoodsDetailList(orderGoodsDetails);
+            orderGoodsVO.setOrderGoodsDetailList(orderGoodsDetails);
-            orderGoodsVO = new OrderGoodsVO();
-            BeanUtils.copyProperties(orderGoods, orderGoodsVO);
-            if(CollUtil.isNotEmpty(orderGoodsDetails)) {
-                List<OrderGoodsDetailVO> orderGoodsDetailVOList = new ArrayList<>();
-                orderGoodsDetails.forEach(detail -> {
-                    OrderGoodsDetailVO orderGoodsDetailVO = new OrderGoodsDetailVO();
-                    BeanUtils.copyProperties(detail, orderGoodsDetailVO);
-                    orderGoodsDetailVOList.add(orderGoodsDetailVO);
-                });
-                orderGoodsVO.setOrderGoodsDetailList(orderGoodsDetailVOList);
-            }
         }
         return orderGoodsVO;
     }
@@ -78,19 +66,7 @@ public class OrderGoodsServiceImpl implements IOrderGoodsService {
      */
     @Override
     public List<OrderGoodsVO> selectOrderGoodsList(OrderGoods orderGoods) {
-        List<OrderGoods> orderGoodsList = orderGoodsMapper.selectOrderGoodsList(orderGoods);
+        return orderGoodsMapper.selectOrderGoodsList(orderGoods);
-        List<OrderGoodsVO> orderGoodsVOList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(orderGoodsList)) {
-            for(OrderGoods goods : orderGoodsList) {
-                OrderGoodsDetail orderGoodsDetail = new OrderGoodsDetail();
-                orderGoodsDetail.setOrderGoodsId(goods.getOrderGoodsId());
-//                goods.setOrderGoodsDetailList(inspectGoodsDetailService.selectOrderGoodsDetailList(orderGoodsDetail));
-                OrderGoodsVO orderGoodsVO = new OrderGoodsVO();
-                BeanUtils.copyProperties(goods, orderGoodsVO);
-                orderGoodsVOList.add(orderGoodsVO);
-            }
-        }
-        return orderGoodsVOList;
     }
 
     /**

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.ims.service.impl;
 
 import java.util.List;
+
+import com.bonus.canteen.core.ims.domain.vo.PurchaseContractDetailVO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@ public class PurchaseContractDetailServiceImpl implements IPurchaseContractDetai
      * @return 采购合同明细
      */
     @Override
-    public PurchaseContractDetail selectPurchaseContractDetailByContractDetailId(Long contractDetailId) {
+    public PurchaseContractDetailVO selectPurchaseContractDetailByContractDetailId(Long contractDetailId) {
         return purchaseContractDetailMapper.selectPurchaseContractDetailByContractDetailId(contractDetailId);
     }
 
@@ -38,7 +40,7 @@ public class PurchaseContractDetailServiceImpl implements IPurchaseContractDetai
      * @return 采购合同明细
      */
     @Override
-    public List<PurchaseContractDetail> selectPurchaseContractDetailList(PurchaseContractDetail purchaseContractDetail) {
+    public List<PurchaseContractDetailVO> selectPurchaseContractDetailList(PurchaseContractDetail purchaseContractDetail) {
         return purchaseContractDetailMapper.selectPurchaseContractDetailList(purchaseContractDetail);
     }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchaseContractServiceImpl.java

@@ -51,14 +51,13 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
      */
     @Override
     public PurchaseContractVO selectPurchaseContractByContractId(Long contractId) {
-        PurchaseContract purchaseContract = purchaseContractMapper.selectPurchaseContractByContractId(contractId);
+        PurchaseContractVO purchaseContractVO = purchaseContractMapper.selectPurchaseContractByContractId(contractId);
-        PurchaseContractVO purchaseContractVO = null;
+        if(Objects.nonNull(purchaseContractVO)) {
-        if(Objects.nonNull(purchaseContract)) {
             PurchaseContractDetail purchaseContractDetail = new PurchaseContractDetail();
             purchaseContractDetail.setContractId(contractId);
-            List<PurchaseContractDetail> purchaseContractDetails = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail);
+            List<PurchaseContractDetailVO> purchaseContractDetails = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail);
-            purchaseContract.setPurchaseContractDetailList(purchaseContractDetails);
+            purchaseContractVO.setPurchaseContractDetailList(purchaseContractDetails);
-            String contractAttachments = purchaseContract.getContractAttachment();
+            String contractAttachments = purchaseContractVO.getContractAttachment();
             List<String> finalAttachmentList = new ArrayList<>();
             if(StringUtils.isNotBlank(contractAttachments)) {
                 String[] contractAttachmentList = StringUtils.split(contractAttachments, ",");
@@ -69,19 +68,9 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
                     }
                 }
             }
-            calContractStatus(purchaseContract);
+            calContractStatus(purchaseContractVO);
-            purchaseContractVO = new PurchaseContractVO();
-            BeanUtils.copyProperties(purchaseContract, purchaseContractVO);
             purchaseContractVO.setContractAttachmentList(finalAttachmentList);
-            if(CollUtil.isNotEmpty(purchaseContractDetails)) {
+            purchaseContractVO.setPurchaseContractDetailList(purchaseContractDetails);
-                List<PurchaseContractDetailVO> purchaseContractDetailVOList = new ArrayList<>();
-                purchaseContractDetails.forEach(detail -> {
-                    PurchaseContractDetailVO purchaseContractDetailVO = new PurchaseContractDetailVO();
-                    BeanUtils.copyProperties(detail, purchaseContractDetailVO);
-                    purchaseContractDetailVOList.add(purchaseContractDetailVO);
-                });
-                purchaseContractVO.setPurchaseContractDetailList(purchaseContractDetailVOList);
-            }
         }
         return purchaseContractVO;
     }
@@ -94,33 +83,16 @@ public class PurchaseContractServiceImpl implements IPurchaseContractService {
      */
     @Override
     public List<PurchaseContractVO> selectPurchaseContractList(PurchaseContract purchaseContract) {
-        List<PurchaseContract> purchaseContracts = purchaseContractMapper.selectPurchaseContractList(purchaseContract);
+        List<PurchaseContractVO> purchaseContractVOList = purchaseContractMapper.selectPurchaseContractList(purchaseContract);
-        List<PurchaseContractVO> purchaseContractVOList = new ArrayList<>();
+        if(CollUtil.isNotEmpty(purchaseContractVOList)) {
-        if(CollUtil.isNotEmpty(purchaseContracts)) {
+            for(PurchaseContractVO contract : purchaseContractVOList) {
-            for(PurchaseContract contract : purchaseContracts) {
-                PurchaseContractDetail purchaseContractDetail = new PurchaseContractDetail();
-                purchaseContractDetail.setContractId(contract.getContractId());
-//                List<PurchaseContractDetail> purchaseContractDetailList = inspectGoodsDetailService.selectPurchaseContractDetailList(purchaseContractDetail);
-//                contract.setPurchaseContractDetailList(purchaseContractDetailList);
                 calContractStatus(contract);
-                PurchaseContractVO purchaseContractVO = new PurchaseContractVO();
-                BeanUtils.copyProperties(contract, purchaseContractVO);
-//                if(CollUtil.isNotEmpty(purchaseContractDetailList)) {
-//                    List<PurchaseContractDetailVO> purchaseContractDetailVOList = new ArrayList<>();
-//                    purchaseContractDetailList.forEach(detail -> {
-//                        PurchaseContractDetailVO purchaseContractDetailVO = new PurchaseContractDetailVO();
-//                        BeanUtils.copyProperties(detail, purchaseContractDetailVO);
-//                        purchaseContractDetailVOList.add(purchaseContractDetailVO);
-//                    });
-//                    purchaseContractVO.setPurchaseContractDetailList(purchaseContractDetailVOList);
-//                }
-                purchaseContractVOList.add(purchaseContractVO);
             }
         }
         return purchaseContractVOList;
     }
 
-    private static void calContractStatus(PurchaseContract contract) {
+    private static void calContractStatus(PurchaseContractVO contract) {
         if (PurchaseContractStatusEnum.END.getKey().equals(contract.getContractStatus())) {
             contract.setContractStatus(PurchaseContractStatusEnum.END.getKey());
         }else {

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanDetailServiceImpl.java

@@ -1,6 +1,8 @@
 package com.bonus.canteen.core.ims.service.impl;
 
 import java.util.List;
+
+import com.bonus.canteen.core.ims.domain.vo.PurchasePlanDetailVO;
 import com.bonus.common.core.exception.ServiceException;
 import com.bonus.common.core.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +29,7 @@ public class PurchasePlanDetailServiceImpl implements IPurchasePlanDetailService
      * @return 采购计划详情
      */
     @Override
-    public PurchasePlanDetail selectPurchasePlanDetailByDetailId(Long detailId) {
+    public PurchasePlanDetailVO selectPurchasePlanDetailByDetailId(Long detailId) {
         return purchasePlanDetailMapper.selectPurchasePlanDetailByDetailId(detailId);
     }
 
@@ -38,7 +40,7 @@ public class PurchasePlanDetailServiceImpl implements IPurchasePlanDetailService
      * @return 采购计划详情
      */
     @Override
-    public List<PurchasePlanDetail> selectPurchasePlanDetailList(PurchasePlanDetail purchasePlanDetail) {
+    public List<PurchasePlanDetailVO> selectPurchasePlanDetailList(PurchasePlanDetail purchasePlanDetail) {
         return purchasePlanDetailMapper.selectPurchasePlanDetailList(purchasePlanDetail);
     }
 

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/service/impl/PurchasePlanServiceImpl.java

@@ -55,25 +55,13 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService {
      */
     @Override
     public PurchasePlanVO selectPurchasePlanByPlanId(Long planId) {
-        PurchasePlan purchasePlan = purchasePlanMapper.selectPurchasePlanByPlanId(planId);
+        PurchasePlanVO purchasePlanVO = purchasePlanMapper.selectPurchasePlanByPlanId(planId);
-        PurchasePlanVO purchasePlanVO = null;
+        if(Objects.nonNull(purchasePlanVO)) {
-        if(Objects.nonNull(purchasePlan)) {
             PurchasePlanDetail purchasePlanDetail = new PurchasePlanDetail();
-            purchasePlanDetail.setPlanId(purchasePlan.getPlanId());
+            purchasePlanDetail.setPlanId(purchasePlanVO.getPlanId());
-            getSupplierNames(purchasePlan);
+            getSupplierNames(purchasePlanVO);
-            List<PurchasePlanDetail> purchasePlanDetails = inspectGoodsDetailService.selectPurchasePlanDetailList(purchasePlanDetail);
+            List<PurchasePlanDetailVO> purchasePlanDetails = inspectGoodsDetailService.selectPurchasePlanDetailList(purchasePlanDetail);
-            purchasePlan.setPurchasePlanDetailList(purchasePlanDetails);
+            purchasePlanVO.setPurchasePlanDetailList(purchasePlanDetails);
-            purchasePlanVO = new PurchasePlanVO();
-            BeanUtils.copyProperties(purchasePlan, purchasePlanVO);
-            if(CollUtil.isNotEmpty(purchasePlanDetails)) {
-                List<PurchasePlanDetailVO> purchasePlanDetailVOList = new ArrayList<>();
-                purchasePlanDetails.forEach(detail -> {
-                    PurchasePlanDetailVO purchasePlanDetailVO = new PurchasePlanDetailVO();
-                    BeanUtils.copyProperties(detail, purchasePlanDetailVO);
-                    purchasePlanDetailVOList.add(purchasePlanDetailVO);
-                });
-                purchasePlanVO.setPurchasePlanDetailList(purchasePlanDetailVOList);
-            }
         }
         return purchasePlanVO;
     }
@@ -86,23 +74,10 @@ public class PurchasePlanServiceImpl implements IPurchasePlanService {
      */
     @Override
     public List<PurchasePlanVO> selectPurchasePlanList(PurchasePlan purchasePlan) {
-        List<PurchasePlan> purchasePlans = purchasePlanMapper.selectPurchasePlanList(purchasePlan);
+        return purchasePlanMapper.selectPurchasePlanList(purchasePlan);
-        List<PurchasePlanVO> purchasePlanVOList = new ArrayList<>();
-        if(CollUtil.isNotEmpty(purchasePlans)) {
-            for(PurchasePlan plan : purchasePlans) {
-                getSupplierNames(plan);
-                PurchasePlanDetail purchasePlanDetail = new PurchasePlanDetail();
-                purchasePlanDetail.setPlanId(plan.getPlanId());
-//                plan.setPurchasePlanDetailList(inspectGoodsDetailService.selectPurchasePlanDetailList(purchasePlanDetail));
-                PurchasePlanVO purchasePlanVO = new PurchasePlanVO();
-                BeanUtils.copyProperties(plan, purchasePlanVO);
-                purchasePlanVOList.add(purchasePlanVO);
-            }
-        }
-        return purchasePlanVOList;
     }
 
-    private void getSupplierNames(PurchasePlan plan) {
+    private void getSupplierNames(PurchasePlanVO plan) {
         if(StringUtils.isNotBlank(plan.getSupplierIds())) {
             String[] supplierIdStrs = plan.getSupplierIds().split(",");
             Long[] supplierIds = Arrays.stream(supplierIdStrs)

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.InspectGoodsDetailMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.InspectGoodsDetail" id="InspectGoodsDetailResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.InspectGoodsDetailVO" id="InspectGoodsDetailResult">
         <result property="inspectGoodsDetailId"    column="inspect_goods_detail_id"    />
         <result property="inspectGoodsId"    column="inspect_goods_id"    />
         <result property="inspectGoodsCode"    column="inspect_goods_code"    />
@@ -21,15 +21,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="materialName"    column="material_name"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialTypeName"    column="material_type_name"    />
+        <result property="unitName"    column="unit_name"    />
+        <result property="size"    column="size"    />
+        <result property="remark"    column="remark"    />
     </resultMap>
 
     <sql id="selectInspectGoodsDetailVo">
         select inspect_goods_detail_id, inspect_goods_id, inspect_goods_code, delivery_goods_detail_id,
                iigd.material_id, iigd.unit_price, order_num, delivery_num, total_qualified_num, qualified_num,
                unqualified_reason, check_pic_urls, iigd.create_by, iigd.create_time, iigd.update_by, iigd.update_time,
-               cm.material_name
+               cm.material_name, cm.material_code, cmt.material_type_name, cm.size, iigd.remark
         from ims_inspect_goods_detail iigd
         left join cook_material cm on cm.material_id = iigd.material_id
+        left join cook_material_type cmt on cm.material_type_id = cmt.material_type_id
+        left join ims_unit iu on iu.unit_id = cm.unit_id
     </sql>
 
     <select id="selectInspectGoodsDetailList" parameterType="com.bonus.canteen.core.ims.domain.InspectGoodsDetail" resultMap="InspectGoodsDetailResult">
@@ -69,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualifiedNum != null">qualified_num,</if>
             <if test="unqualifiedReason != null">unqualified_reason,</if>
             <if test="checkPicUrls != null">check_pic_urls,</if>
+            <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -86,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualifiedNum != null">#{qualifiedNum},</if>
             <if test="unqualifiedReason != null">#{unqualifiedReason},</if>
             <if test="checkPicUrls != null">#{checkPicUrls},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -107,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualifiedNum != null">qualified_num = #{qualifiedNum},</if>
             <if test="unqualifiedReason != null">unqualified_reason = #{unqualifiedReason},</if>
             <if test="checkPicUrls != null">check_pic_urls = #{checkPicUrls},</if>
+            <if test="remark != null">remark = #{remark},</if>
 <!--            <if test="createBy != null">create_by = #{createBy},</if>-->
 <!--            <if test="createTime != null">create_time = #{createTime},</if>-->
             <if test="updateBy != null">update_by = #{updateBy},</if>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/InspectGoodsMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.InspectGoodsMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.InspectGoods" id="InspectGoodsResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.InspectGoodsVO" id="InspectGoodsResult">
         <result property="inspectGoodsId"    column="inspect_goods_id"    />
         <result property="inspectGoodsCode"    column="inspect_goods_code"    />
         <result property="inspectDate"    column="inspect_date"    />
@@ -21,11 +21,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="relateOrderGoodsId"    column="relate_order_goods_id"    />
         <result property="ifInto"    column="if_into"    />
         <result property="signaturePicUrl"    column="signature_pic_url"    />
+        <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="deliverySupplierName"    column="delivery_supplier_name"    />
+        <result property="areaId"    column="area_id"    />
     </resultMap>
 
     <sql id="selectInspectGoodsVo">
@@ -33,10 +35,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                relate_delivery_goods_id, delivery_supplier_id, delivery_man, delivery_phone,
                delivery_warehouse_id, delivery_total_num, delivery_date, inspect_qualified_num,
                total_qualified_num, relate_order_goods_id, if_into, signature_pic_url,
-               iig.create_by, iig.create_time, iig.update_by, iig.update_time,
+               iig.create_by, iig.create_time, iig.update_by, iig.update_time, iwi.area_id,
-               isr.supplier_name as delivery_supplier_name
+               isr.supplier_name as delivery_supplier_name, iig.remark
         from ims_inspect_goods iig
         left join ims_supplier isr on isr.supplier_id = iig.delivery_supplier_id
+        left join ims_warehouse_info iwi on iwi.warehouse_id = iig.delivery_warehouse_id
     </sql>
 
     <select id="selectInspectGoodsList" parameterType="com.bonus.canteen.core.ims.domain.InspectGoods" resultMap="InspectGoodsResult">
@@ -94,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relateOrderGoodsId != null">relate_order_goods_id,</if>
             <if test="ifInto != null">if_into,</if>
             <if test="signaturePicUrl != null">signature_pic_url,</if>
+            <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -116,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relateOrderGoodsId != null">#{relateOrderGoodsId},</if>
             <if test="ifInto != null">#{ifInto},</if>
             <if test="signaturePicUrl != null">#{signaturePicUrl},</if>
+            <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -142,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="relateOrderGoodsId != null">relate_order_goods_id = #{relateOrderGoodsId},</if>
             <if test="ifInto != null">if_into = #{ifInto},</if>
             <if test="signaturePicUrl != null">signature_pic_url = #{signaturePicUrl},</if>
+            <if test="remark != null">remark = #{remark},</if>
 <!--            <if test="createBy != null">create_by = #{createBy},</if>-->
 <!--            <if test="createTime != null">create_time = #{createTime},</if>-->
             <if test="updateBy != null">update_by = #{updateBy},</if>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.OrderGoodsDetailMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.OrderGoodsDetail" id="OrderGoodsDetailResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.OrderGoodsDetailVO" id="OrderGoodsDetailResult">
         <result property="orderGoodsDetailId"    column="order_goods_detail_id"    />
         <result property="orderGoodsId"    column="order_goods_id"    />
         <result property="materialId"    column="material_id"    />
@@ -17,22 +17,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="unqualifiedReason"    column="unqualified_reason"    />
         <result property="ifAllInspect"    column="if_all_inspect"    />
         <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+<!--        <result property="delFlag"    column="del_flag"    />-->
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="materialName"    column="material_name"    />
         <result property="unitName"    column="unit_name"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialTypeName"    column="material_type_name"    />
     </resultMap>
 
     <sql id="selectOrderGoodsDetailVo">
         select order_goods_detail_id, order_goods_id, iogd.material_id, iogd.unit_id, iogd.size,
                order_num, single_price, total_price, into_num, unqualified_num,
                unqualified_reason, if_all_inspect, remark, del_flag, iogd.create_by,
-               iogd.create_time, iogd.update_by, iogd.update_time, cm.material_name, iu.unit_name
+               iogd.create_time, iogd.update_by, iogd.update_time, cm.material_name, iu.unit_name,
+               cm.material_code, cmt.material_type_name
         from ims_order_goods_detail iogd
         left join cook_material cm on cm.material_id = iogd.material_id
+        left join cook_material_type cmt on cm.material_type_id = cmt.material_type_id
         left join ims_unit iu on iu.unit_id = iogd.unit_id
     </sql>
 

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/OrderGoodsMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.OrderGoodsMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.OrderGoods" id="OrderGoodsResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.OrderGoodsVO" id="OrderGoodsResult">
         <result property="orderGoodsId"    column="order_goods_id"    />
         <result property="orderGoodsCode"    column="order_goods_code"    />
         <result property="supplierId"    column="supplier_id"    />
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="confirmRemark"    column="confirm_remark"    />
         <result property="ifAllInspect"    column="if_all_inspect"    />
         <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+<!--        <result property="delFlag"    column="del_flag"    />-->
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.PurchaseContractDetailMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.PurchaseContractDetail" id="PurchaseContractDetailResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.PurchaseContractDetailVO" id="PurchaseContractDetailResult">
         <result property="contractDetailId"    column="contract_detail_id"    />
         <result property="contractId"    column="contract_id"    />
         <result property="contractCode"    column="contract_code"    />
@@ -14,21 +14,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="singlePrice"    column="single_price"    />
         <result property="totalPrice"    column="total_price"    />
         <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+<!--        <result property="delFlag"    column="del_flag"    />-->
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="materialName"    column="material_name"    />
         <result property="unitName"    column="unit_name"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialTypeName"    column="material_type_name"    />
     </resultMap>
 
     <sql id="selectPurchaseContractDetailVo">
         select contract_detail_id, contract_id, contract_code, ipcd.material_id, ipcd.unit_id, ipcd.size,
                order_num, single_price, total_price, remark, del_flag, ipcd.create_by,
-               ipcd.create_time, ipcd.update_by, ipcd.update_time, cm.material_name, iu.unit_name
+               ipcd.create_time, ipcd.update_by, ipcd.update_time, cm.material_name, iu.unit_name,
+               cm.material_code, cmt.material_type_name
         from ims_purchase_contract_detail ipcd
         left join cook_material cm on ipcd.material_id = cm.material_id
+        left join cook_material_type cmt on cm.material_type_id = cmt.material_type_id
         left join ims_unit iu on ipcd.unit_id = iu.unit_id
     </sql>
 

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchaseContractMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.PurchaseContractMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.PurchaseContract" id="PurchaseContractResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.PurchaseContractVO" id="PurchaseContractResult">
         <result property="contractId"    column="contract_id"    />
         <result property="contractCode"    column="contract_code"    />
         <result property="supplierId"    column="supplier_id"    />
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payRemark"    column="pay_remark"    />
         <result property="contractAttachment"    column="contract_attachment"    />
         <result property="contractPerson"    column="contract_person"    />
-        <result property="delFlag"    column="del_flag"    />
+<!--        <result property="delFlag"    column="del_flag"    />-->
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanDetailMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.PurchasePlanDetailMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.PurchasePlanDetail" id="PurchasePlanDetailResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.PurchasePlanDetailVO" id="PurchasePlanDetailResult">
         <result property="detailId"    column="detail_id"    />
         <result property="planId"    column="plan_id"    />
         <result property="planCode"    column="plan_code"    />
@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stallId"    column="stall_id"    />
         <result property="originalQuantity"    column="original_quantity"    />
         <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+<!--        <result property="delFlag"    column="del_flag"    />-->
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -26,15 +26,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="materialName"    column="material_name"    />
         <result property="unitName"    column="unit_name"    />
         <result property="stallName"    column="stall_name"    />
+        <result property="materialCode"    column="material_code"    />
+        <result property="materialTypeName"    column="material_type_name"    />
     </resultMap>
 
     <sql id="selectPurchasePlanDetailVo">
         select detail_id, plan_id, plan_code, ippd.material_id, ippd.unit_id, ippd.unit_price, ippd.size,
                purchase_num, production_plan_num, inventory_num, purchase_budget_price,
                ippd.stall_id, original_quantity, remark, ippd.del_flag, ippd.create_by, ippd.create_time,
-               ippd.update_by, ippd.update_time, cm.material_name, iu.unit_name, bs.stall_name
+               ippd.update_by, ippd.update_time, cm.material_name, iu.unit_name, bs.stall_name,
+               cm.material_code, cmt.material_type_name
         from ims_purchase_plan_detail ippd
         left join cook_material cm on cm.material_id = ippd.material_id
+        left join cook_material_type cmt on cm.material_type_id = cmt.material_type_id
         left join ims_unit iu on iu.unit_id = ippd.unit_id
         left join basic_stall bs on bs.stall_id = ippd.stall_id
     </sql>

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/PurchasePlanMapper.xml

@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.canteen.core.ims.mapper.PurchasePlanMapper">
-    <resultMap type="com.bonus.canteen.core.ims.domain.PurchasePlan" id="PurchasePlanResult">
+    <resultMap type="com.bonus.canteen.core.ims.domain.vo.PurchasePlanVO" id="PurchasePlanResult">
         <result property="planId"    column="plan_id"    />
         <result property="planCode"    column="plan_code"    />
         <result property="status"    column="status"    />
@@ -16,6 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="areaId"    column="area_id"    />
         <result property="canteenId"    column="canteen_id"    />
         <result property="stallId"    column="stall_id"    />
+        <result property="totalNum"    column="total_num"    />
         <result property="purchaseBudgetTotal"    column="purchase_budget_total"    />
         <result property="supplierIds"    column="supplier_ids"    />
         <result property="approveBy"    column="approve_by"    />
@@ -24,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="ifMerge"    column="if_merge"    />
         <result property="deliverGoodsDate"    column="deliver_goods_date"    />
         <result property="remark"    column="remark"    />
-        <result property="delFlag"    column="del_flag"    />
+<!--        <result property="delFlag"    column="del_flag"    />-->
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -37,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectPurchasePlanVo">
         select plan_id, plan_code, ipp.status, purchase_date, purchase_user_id, production_plan_id,
                approve_status, process_instance_id, relate_plan_ids, ipp.area_id, ipp.canteen_id, ipp.stall_id,
-               purchase_budget_total, supplier_ids, approve_by, approve_time, approve_remark,
+               total_num, purchase_budget_total, supplier_ids, approve_by, approve_time, approve_remark,
                if_merge, deliver_goods_date, ipp.remark, ipp.del_flag, ipp.create_by, ipp.create_time,
                ipp.update_by, ipp.update_time, bc.canteen_name, bs.stall_name, ba.area_name
         from ims_purchase_plan ipp
@@ -98,6 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaId != null">area_id,</if>
             <if test="canteenId != null">canteen_id,</if>
             <if test="stallId != null">stall_id,</if>
+            <if test="totalNum != null">total_num,</if>
             <if test="purchaseBudgetTotal != null">purchase_budget_total,</if>
             <if test="supplierIds != null">supplier_ids,</if>
             <if test="approveBy != null">approve_by,</if>
@@ -124,6 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaId != null">#{areaId},</if>
             <if test="canteenId != null">#{canteenId},</if>
             <if test="stallId != null">#{stallId},</if>
+            <if test="totalNum != null">#{totalNum},</if>
             <if test="purchaseBudgetTotal != null">#{purchaseBudgetTotal},</if>
             <if test="supplierIds != null">#{supplierIds},</if>
             <if test="approveBy != null">#{approveBy},</if>
@@ -154,6 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="areaId != null">area_id = #{areaId},</if>
             <if test="canteenId != null">canteen_id = #{canteenId},</if>
             <if test="stallId != null">stall_id = #{stallId},</if>
+            <if test="totalNum != null">total_num = #{totalNum},</if>
             <if test="purchaseBudgetTotal != null">purchase_budget_total = #{purchaseBudgetTotal},</if>
             <if test="supplierIds != null">supplier_ids = #{supplierIds},</if>
             <if test="approveBy != null">approve_by = #{approveBy},</if>