分切计划查询优化

lms/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/SlittingproductionplanServiceImpl.java

@@ -51,6 +51,10 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
         String resource_name = MapUtil.getStr(whereJson, "resource_name");
         String parent_container_name = MapUtil.getStr(whereJson, "parent_container_name");
         String container_name = MapUtil.getStr(whereJson, "container_name");
+        String qzzno = MapUtil.getStr(whereJson, "qzzno");
+        String is_parent_ok = MapUtil.getStr(whereJson, "is_parent_ok");
+        String is_child_tz_ok = MapUtil.getStr(whereJson, "is_child_tz_ok");
+        String is_child_ps_ok = MapUtil.getStr(whereJson, "is_child_ps_ok");
         String begin_time = MapUtil.getStr(whereJson, "begin_time");
         String end_time = MapUtil.getStr(whereJson, "end_time");
 
@@ -61,9 +65,13 @@ public class SlittingproductionplanServiceImpl implements Slittingproductionplan
         map.put("status", status);
         map.put("begin_time", begin_time);
         map.put("end_time", end_time);
+        map.put("is_parent_ok", is_parent_ok);
+        map.put("is_child_tz_ok", is_child_tz_ok);
+        map.put("is_child_ps_ok", is_child_ps_ok);
         if (ObjectUtil.isNotEmpty(resource_name)) map.put("resource_name","%"+resource_name+"%");
         if (ObjectUtil.isNotEmpty(parent_container_name)) map.put("parent_container_name","%"+parent_container_name+"%");
         if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%");
+        if (ObjectUtil.isNotEmpty(qzzno)) map.put("qzzno","%"+qzzno+"%");
 
         JSONObject json = WQL.getWO("PDM_BI_SLIDTTINGPLAN_01").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "plan.container_name");
         return json;

lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/PDM_BI_SLIDTTINGPLAN_01.wql

@@ -22,6 +22,10 @@
 	输入.container_name					TYPEAS s_string
 	输入.begin_time					    TYPEAS s_string
 	输入.end_time					    TYPEAS s_string
+	输入.qzzno    					    TYPEAS s_string
+	输入.is_child_ps_ok					TYPEAS s_string
+	输入.is_child_tz_ok					TYPEAS s_string
+	输入.is_parent_ok					TYPEAS s_string
 
 
 [临时表]
@@ -82,6 +86,22 @@
                     plan.container_name like 输入.container_name
                 ENDOPTION
 
+                OPTION 输入.qzzno <> ""
+                    plan.qzzno like 输入.qzzno
+                ENDOPTION
+
+                OPTION 输入.is_parent_ok <> ""
+                    plan.is_parent_ok = 输入.is_parent_ok
+                ENDOPTION
+
+                OPTION 输入.is_child_tz_ok <> ""
+                    plan.is_child_tz_ok = 输入.is_child_tz_ok
+                ENDOPTION
+
+                OPTION 输入.is_child_ps_ok <> ""
+                    plan.is_child_ps_ok = 输入.is_child_ps_ok
+                ENDOPTION
+
                 OPTION 输入.begin_time <> ""
                     plan.manufacture_date >= 输入.begin_time
                 ENDOPTION

lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue

@@ -87,6 +87,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="母卷号">
+                <label slot="label">母&nbsp;&nbsp;卷&nbsp;&nbsp;号:</label>
                 <el-input
                   v-model="query.parent_container_name"
                   clearable
@@ -111,8 +112,24 @@
             </el-col>
           </el-row>
           <el-row>
+
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="气涨轴">
+                <label slot="label">气&nbsp;&nbsp;涨&nbsp;&nbsp;轴:</label>
+                <el-input
+                  v-model="query.qzzno"
+                  clearable
+                  size="mini"
+                  placeholder="气涨轴编号"
+                  style="width: 250px"
+                  @keyup.enter.native="crud.toQuery"
+                />
+              </el-form-item>
+            </el-col>
             <el-form-item label="日期">
-              <label slot="label">日&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;期:</label>
+              <label slot="label">日&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;期:</label>
               <el-date-picker
                 v-model="query.createTime"
                 type="daterange"
@@ -123,7 +140,65 @@
                 @change="crud.toQuery"
               />
             </el-form-item>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="母卷上料完成">
+                <el-select
+                  v-model="query.is_parent_ok"
+                  clearable
+                  placeholder="母卷上料完成"
+                  class="filter-item"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in dict.IS_OR_NOT"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="子卷套轴完成">
+                <el-select
+                  v-model="query.is_child_tz_ok"
+                  clearable
+                  placeholder="子卷套轴完成"
+                  class="filter-item"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in dict.IS_OR_NOT"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="子卷配送完成">
+                <el-select
+                  v-model="query.is_child_ps_ok"
+                  clearable
+                  placeholder="子卷配送完成"
+                  class="filter-item"
+                  @change="crud.toQuery"
+                >
+                  <el-option
+                    v-for="item in dict.IS_OR_NOT"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
               <rrOperation/>
+            </el-col>
           </el-row>
 
         </el-form>
@@ -320,7 +395,8 @@
         </div>
       </el-dialog>
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+                @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55"/>
         <el-table-column v-if="false" prop="workorder_id" label="分切计划标识"/>
         <el-table-column prop="status" label="状态" :formatter="formatStatusName"/>
@@ -422,7 +498,7 @@ const defaultForm = {
 }
 export default {
   name: 'Slittingproductionplan',
-  dicts: ['product_area', 'order_type', 'cut_product_status', 'IS_OR_NOT', 'ware_house', 'paper_tube_or_frp'],
+  dicts: ['product_area', 'order_type', 'cut_product_status', 'ware_house', 'paper_tube_or_frp', 'IS_OR_NOT'],
   components: { pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {