商品过滤

jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/ProductWarehouseMapper.xml

@@ -53,6 +53,7 @@
         <result column="order_main_unit_name" property="orderMainUnitName"/>
         <result column="sales_main_unit_id" property="salesMainUnitId"/>
         <result column="sales_main_unit_name" property="salesMainUnitName"/>
+        <result column="business_line_id_arr" property="businessLineIdArr"/>
         <result column="input_tax_rate" property="inputTaxRate"/>
         <result column="output_tax_rate" property="outputTaxRate"/>
         <result column="productId" property="productId"/>
@@ -71,8 +72,12 @@
             a.order_main_unit_id, JgFnUnitArrName(a.order_main_unit_id) as order_main_unit_name,
             a.sales_main_unit_id, JgFnUnitArrName(a.sales_main_unit_id) as sales_main_unit_name,
             a.input_tax_rate,
-            a.output_tax_rate
-        FROM jg_product a ${ew.customSqlSegment}
+            a.output_tax_rate,
+            b.business_line_id as business_line_id_arr
+        FROM jg_product a LEFT JOIN jg_product_business b ON a.id = b.product_id ${ew.customSqlSegment}
+        <if test="productWarehousePagination.businessLineIdArr != null and productWarehousePagination.businessLineIdArr != ''">
+            WHERE b.business_line_id like CONCAT('%',${productWarehousePagination.businessLineIdArr},'%')
+        </if>
         <if test="productWarehousePagination.sidx != null and productWarehousePagination.sidx != ''">
             ORDER BY ${productWarehousePagination.sidx} ${productWarehousePagination.sort}
         </if>

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ProductWarehouseEntity.java

@@ -296,5 +296,7 @@ public class ProductWarehouseEntity  {
     private String orderMainUnitName;
     @TableField(exist = false)
     private String salesMainUnitName;
+    @TableField(exist = false)
+    private String businessLineIdArr;
 
 }

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/productwarehouse/ProductWarehousePagination.java

@@ -33,6 +33,9 @@ public class ProductWarehousePagination extends Pagination {
     /** 商品名称 */
     @JsonProperty("name")
     private Object name;
+    /** 业务线 */
+    @JsonProperty("businessLineIdArr")
+    private Object businessLineIdArr;
     /** 商品类型 */
     @JsonProperty("productTypeId")
     private Object productTypeId;

jnpf-java-boot/jnpf-web/src/views/scm/contractL/form.vue

@@ -2581,7 +2581,15 @@ export default {
         excludeIdList.push(this.dataForm.contractLCommodityList[i].productId);
       }
       this.$nextTick(() => {
-        this.$refs.BomGoodsRawBox.init(excludeIdList);
+        if (!this.dataForm.businessId) {
+          this.$message({
+            message: "请先选择业务线",
+            type: "error",
+            duration: 1000
+          });
+          return;
+        }
+        this.$refs.BomGoodsRawBox.init(excludeIdList, this.dataForm.businessId);
       });
     },
     chgContractType() {
@@ -2597,6 +2605,7 @@ export default {
       this.dataForm.subject = undefined;
       this.dataForm.subject2 = undefined;
       this.dataForm.subject3 = undefined;
+      this.dataForm.contractLCommodityList = [];
       this.paramListSubject11[2]["defaultValue"] = this.dataForm.businessId;
       this.paramListSubject21[2]["defaultValue"] = this.dataForm.businessId;
       this.paramListSubject12[2]["defaultValue"] = this.dataForm.businessId;

jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/ProductListBox.vue

@@ -99,19 +99,23 @@ export default {
         currentPage: 1,
         pageSize: 20,
         sort: "desc",
-        sidx: ""
+        sidx: "",
+        businessLineIdArr: ""
       },
-      excludeIdList: [],
       checked: []
     };
   },
   methods: {
-    init(excludeIdList, val) {
+    init(excludeIdList, business_line_id) {
       this.visible = true;
       this.listLoading = true;
       if (excludeIdList) {
         this.excludeIdList = excludeIdList;
+        if (!excludeIdList.page) {
+          this.listQuery.businessLineIdArr = business_line_id;
+        }
       }
+      console.log(this.listQuery);
       let query = {
         ...this.listQuery,
         dataType: 0,
@@ -149,7 +153,6 @@ export default {
       this.$emit("refreshDataList", this.checked);
     },
     handleSelectionChange(val) {
-      console.log(val);
       this.checked = val;
     }
   }