更新

src/main/java/com/lsw/controller/IndexController.java

@@ -4,18 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
-import com.jfinal.json.FastJson;
 import com.jfinal.kit.JsonKit;
 import com.jfinal.kit.StrKit;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.tx.Tx;
 import com.lsw.utils.TimeUtil;
-import com.sun.xml.internal.bind.v2.model.core.ID;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -38,7 +35,7 @@ public class IndexController extends Controller {
             sb.append(" ORDER BY ITEM_PX ASC");
             all = Db.find(sb.toString(), bh, ITEM_VALUE);
         } else {
-            sb.append(" ORDER BY ITEM_PX ASC");
+            sb.append(" ORDER BY TO_NUMBER(ITEM_PX) ASC");
             all = Db.find(sb.toString(), bh);
         }
         List<Record> list = all.stream().filter(r -> r.getStr("ITEM_UPBH").equals(bh)).collect(Collectors.toList());

src/main/java/com/lsw/controller/ReportController.java

@@ -180,7 +180,7 @@ public class ReportController extends BaseController {
         renderJson(r);
     }
 
-    //委托单点击联动2
+    //委托单点击联动
     public void getWtd() {
         List<Record> list = Db.template("getWttld", getParam()).find();
         renderJson(Kv.by("data", list));

src/main/resources/report.sql

@@ -169,6 +169,9 @@ FROM
 WHERE
 	y.item_upbh IS NULL
 	AND y.item_name =#para(time_name)
+    #if(item_pky)
+	AND y.item_pky LIKE #para(item_pky, "like")
+	#end
 #end
 
 #sql("time_list")
@@ -251,3 +254,51 @@ WHERE
  #end
 
 #end
+
+###样机最新状态 获取key值通过key值去查询样机数据
+#sql("getYj")
+SELECT * FROM
+             (SELECT
+                   y.item_version,
+                   y.item_key
+               FROM
+                   tlk_myjcs y
+               WHERE
+                   y.item_upbh IS NULL
+                    AND y.item_name =#para(ITEM_NAME)
+                  #if(ITEM_XL_NUM)
+                     AND y.ITEM_XL_NUM=#para(ITEM_XL_NUM)
+                  #end
+                ORDER BY y.item_version desc) WHERE ROWNUM<2
+#end
+
+###委托单
+#sql("getWtt")
+SELECT
+    y.ITEM_NAME,
+    y.ITEM_PRO,
+    y.ITEM_VERSION,
+    w.ID,
+    w.ITEM_WT_NUM,
+    w.ITEM_TITLE,
+    y.created
+FROM
+    tlk_wyjcs y
+        LEFT JOIN TLK_EXAMINE w ON w.item_wt_num = y.item_value
+WHERE
+    y.item_upbh IS NULL
+  AND y.item_name =#para(ITEM_NAME)
+ #end
+
+###委托单联动
+#sql("getWttld")
+SELECT
+    D.*,
+    to_char( D.lastmodified, 'yyyy-mm-dd hh24:mi:ss' ) AS item_lastmodified
+FROM
+    TLK_STRUCTURED_DATA D
+WHERE
+        D.item_wt_num=#para(ITEM_WT_NUM) and D.item_pro_num=#para(ITEM_PRO_NUM)
+#end
+
+

src/main/webapp/WEB-INF/view/index.html

@@ -19,7 +19,7 @@
     .bg {padding: 50px 10%;overflow: hidden;}
     input{border: 0px;padding-right: 13px;padding-left: 13px;max-width: 150px; background-color: white;box-shadow: none!important;outline: none;text-align: center;font-size: 15px}
     #end
-    table {margin: 0 auto;background-color: white;border-collapse: collapse;width: 100%;}
+    table {margin: 0 auto;background-color: white;border-collapse: collapse;width: 100%;border-color: #d5c9c9;border: 1px solid #d5c9c9;}
     td {padding: 15px;text-align: center;position: relative;}
     .bar{width: 100%;text-align: left;margin: 0 auto}
     button{margin-bottom: 10px;padding: 5px 20px;cursor: pointer;}

src/main/webapp/WEB-INF/view/report/forms.html

@@ -13,10 +13,10 @@
 <div id="app" v-cloak>
     <div class="row">
         <el-form :inline="true" label-width="auto">
-            <el-form-item label="样机选择">
+            <el-form-item label="样机名称">
                 <el-input placeholder="请输入样机名称" v-model="param.ITEM_NAME" clearable></el-input>
             </el-form-item>
-            <el-form-item label="样机选择" clearable>
+            <el-form-item label="样机序列号" clearable>
                 <el-input placeholder="请输入样机序列号" v-model="param.ITEM_XL_NUM" clearable></el-input>
             </el-form-item>
             <el-form-item>
@@ -28,13 +28,14 @@
                 <!--样机-->
                 <div class="box" v-loading="loading" style="height: 400px">
                     <iframe id="yj" :src="'#(path)/index?bh='+param.ITEM_KEY+ '&table=TLK_MYJCS&look=true'"  class="iframe1" v-if="param.ITEM_KEY"></iframe>
+                      <el-empty :image-size="100" v-else></el-empty>
                 </div>
              <div style="margin-top:20px;margin-left: -5px;margin-right: -5px">
                  <div class="sm4">
                      <div class="mains">
                          <!--委托单-->
                          <div class="box">
-                             <el-table :data="tableData" class="table" :key="key" v-loading="loading" @row-click="select" v-if="param.ITEM_KEY">
+                             <el-table :data="tableData" class="table" :key="key" v-loading="loading" @row-click="select">
                                  <el-table-column width="35" align="center">
                                      <template slot-scope="scope">
                                          <el-checkbox :checked="scope.row.check"></el-checkbox>
@@ -114,8 +115,10 @@
                 sendAjax("#(path)/report/getYj", this.param, res => {
                     cancelLoding();
                     //vm.param.time = res.time;
-                    if( res.yj.ITEM_KEY){
+                    if( res.yj){
                         vm.param.ITEM_KEY = res.yj.ITEM_KEY;
+                    }else{
+                        vm.param.ITEM_KEY='';
                     }
                     vm.tableData = res.wtd;
                     setTimeout(() => {