设备清运单，桶列表

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleBucketServiceImpl.java

@@ -144,6 +144,15 @@ public class RecycleBucketServiceImpl extends ServiceImpl<RecycleBucketMapper, R
             }
         }
         if(isPc){
+            if(ObjectUtil.isNotEmpty(recycleBucketPagination.getDeviceCode())){
+                recycleBucketNum++;
+
+                String value = recycleBucketPagination.getDeviceCode() instanceof List ?
+                        JsonUtil.getObjectToString(recycleBucketPagination.getDeviceCode()) :
+                        String.valueOf(recycleBucketPagination.getDeviceCode());
+                recycleBucketQueryWrapper.lambda().like(RecycleBucketEntity::getDeviceCode,value);
+
+            }
             if(ObjectUtil.isNotEmpty(recycleBucketPagination.getBucketCode())){
                 recycleBucketNum++;
 

jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java

@@ -185,6 +185,15 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
                 recycleCleanOrderQueryWrapper.lambda().like(RecycleCleanOrderEntity::getBucketCode, value);
 
             }
+            if (ObjectUtil.isNotEmpty(recycleCleanOrderPagination.getDeviceCode())) {
+                recycleCleanOrderNum++;
+
+                String value = recycleCleanOrderPagination.getDeviceCode() instanceof List ?
+                        JsonUtil.getObjectToString(recycleCleanOrderPagination.getDeviceCode()) :
+                        String.valueOf(recycleCleanOrderPagination.getDeviceCode());
+                recycleCleanOrderQueryWrapper.lambda().like(RecycleCleanOrderEntity::getDeviceCode, value);
+
+            }
 
         }
         List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclebucket/RecycleBucketPagination.java

@@ -27,6 +27,9 @@ public class RecycleBucketPagination extends Pagination {
     private String moduleId;
     /** 菜单id */
     private String menuId;
+    /** 设备编号 */
+    @JsonProperty("deviceCode")
+    private Object deviceCode;
     /** 桶编号 */
     @JsonProperty("bucketCode")
     private Object bucketCode;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclecleanorder/RecycleCleanOrderPagination.java

@@ -33,4 +33,7 @@ public class RecycleCleanOrderPagination extends Pagination {
     /** 桶编码 */
     @JsonProperty("bucketCode")
     private Object bucketCode;
+    /** 桶编码 */
+    @JsonProperty("deviceCode")
+    private Object deviceCode;
 }

jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue

@@ -8,6 +8,11 @@
                             <el-input v-model="query.orderNo" placeholder="请输入" clearable> </el-input>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="6">
+                        <el-form-item label="设备编码">
+                            <el-input v-model="query.deviceCode" placeholder="请输入" clearable> </el-input>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="6">
                         <el-form-item label="桶编码">
                             <el-input v-model="query.bucketCode" placeholder="请输入" clearable> </el-input>
@@ -185,6 +190,7 @@ export default {
             query: {
                 orderNo: undefined,
                 bucketCode: undefined,
+                deviceCode: undefined,
             },
             treeProps: {
                 children: 'children',
@@ -230,6 +236,8 @@ export default {
         }
     },
     created() {
+        this.query.deviceCode = this.$route.query.deviceCode
+        console.log(this.query)
         this.getColumnList(),
         this.initSearchDataAndListData()
         this.queryData = JSON.parse(JSON.stringify(this.query))

jnpf-java-boot/jnpf-web/src/views/recycledevice/index.vue

@@ -190,26 +190,29 @@
           <el-table-column label="统计/记录" width="100" algin="left">
             <template slot-scope="scope">
               <div style="font-size: 20px;">
-                <i
+                <span @click="fnNavToRecyclecleanorder(scope.row.deviceCode)"
-                  class="el-icon-s-grid"
+                  ><i
-                  style="cursor: pointer;color: green;"
+                    class="el-icon-s-grid"
-                  title="清运订单"
+                    style="cursor: pointer;color: green;"
-                ></i>
+                    title="清运订单"
-                <i
+                  ></i
-                  class="el-icon-s-grid"
+                ></span>
-                  style="cursor: pointer;color: blue;"
+                <span
-                  title="投递订单"
+                  @click="fnNavToRecycledeliveryorder(scope.row.deviceCode)"
-                ></i>
+                >
-                <i
+                  <i
-                  class="el-icon-s-custom"
+                    class="el-icon-s-grid"
-                  style="cursor: pointer;color: greenyellow;"
+                    style="cursor: pointer;color: blue;"
-                  title="查看设备已注册会员"
+                    title="投递订单"
-                ></i>
+                  ></i
-                <i
+                ></span>
-                  class="el-icon-delete-solid"
+                <span @click="fnNavToRecyclebucket(scope.row.deviceCode)"
-                  style="cursor: pointer;color: gray;"
+                  ><i
-                  title="查看设备子桶列表"
+                    class="el-icon-delete-solid"
-                ></i>
+                    style="cursor: pointer;color: gray;"
+                    title="查看设备子桶列表"
+                  ></i
+                ></span>
               </div>
             </template>
           </el-table-column>
@@ -253,14 +256,16 @@
                     <div>{{ item.showName }} {{ item.currentWeight }} KG</div>
                   </el-col>
                   <el-col :span="10">
-                    <div><el-progress
+                    <div>
-                  :percentage="item.progress"
+                      <el-progress
-                  :color="[
+                        :percentage="item.progress"
-                    { color: 'green', percentage: 20 },
+                        :color="[
-                    { color: 'yellow', percentage: 80 },
+                          { color: 'green', percentage: 20 },
-                    { color: 'red', percentage: 90 }
+                          { color: 'yellow', percentage: 80 },
-                  ]"
+                          { color: 'red', percentage: 90 }
-                ></el-progress></div>
+                        ]"
+                      ></el-progress>
+                    </div>
                   </el-col>
                 </el-row>
               </div>
@@ -467,6 +472,21 @@ export default {
     this.queryData = JSON.parse(JSON.stringify(this.query));
   },
   methods: {
+    fnNavToRecyclecleanorder(deviceCode) {
+      this.$router.push({
+        path: "/recyclecleanorder",
+        query: { deviceCode: deviceCode }
+      });
+    },
+    fnNavToRecycledeliveryorder(deviceCode) {
+      this.$router.push({
+        path: "/recycledeliveryorder",
+        query: { deviceCode: deviceCode }
+      });
+    },
+    fnNavToRecyclebucket(deviceCode) {
+      this.$router.push({ path: "/recyclebucket", query: { deviceCode: deviceCode } });
+    },
     toDetail(defaultValue, modelId) {
       if (!defaultValue) return;
       getConfigData(modelId).then(res => {