供应商、订单采购加入供应商筛选等

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/cook/domain/CookMaterial.java

@@ -132,6 +132,8 @@ public class CookMaterial extends BaseEntity {
 
     @ApiModelProperty(value = "当前库存总数")
     private BigDecimal materialTotalNum;
+    @ApiModelProperty(value = "供应商ID")
+    private String supplierId;
 
     /**
      * 在原料中判断是否存在库存

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/dto/SupplierPageDTO.java

@@ -28,6 +28,16 @@ public class SupplierPageDTO {
    private List<Long> areaIdList;
    @ApiModelProperty("是否分页")
    private Integer isPaging =0;
+   @ApiModelProperty("type类型")
+   private String type;
+
+   public String getType() {
+      return type;
+   }
+
+   public void setType(String type) {
+      this.type = type;
+   }
 
    public Integer getIsPaging() {
       return isPaging;

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/cook/CookMaterialMapper.xml

@@ -66,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             left join cook_nutrition cn on cm.nutrition_id = cn.nutrition_id
             left join ims_unit iu on cm.unit_id = iu.unit_id
             left join basic_area a on cm.area_id = a.area_id
+            left join ims_supplier_bind_material isbt on cm.material_id = isbt.material_id
             left join
             (select material_id, sum(material_num) as material_total_num
             from ims_inventory
@@ -110,6 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bigCategoryId != null "> and cm.big_category_id = #{bigCategoryId}</if>
             <if test="size != null  and size != ''"> and cm.size = #{size}</if>
             <if test="description != null  and description != ''"> and cm.description = #{description}</if>
+            <if test="supplierId != null  and supplierId != ''"> and isbt.supplier_id = #{supplierId}</if>
         </where>
         group by material_id
         order by cm.create_time desc

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

@@ -350,6 +350,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="content.supplierId != null">
             and a.supplier_id = #{content.supplierId}
         </if>
+        <if test="content.type == null or content.type == ''">
+            and a.status = '1'
+        </if>
         <if test="content.supplierCode != null and content.supplierCode != ''">
             and a.supplier_code = #{content.supplierCode}
         </if>