feat:金蝶集成框架

zkqy-admin/src/test/java/com/zkqy/Test01.java

@@ -1,75 +0,0 @@
-package com.zkqy;
-
-
-
-import com.google.gson.Gson;
-import com.kingdee.bos.webapi.entity.IdentifyInfo;
-import com.kingdee.bos.webapi.entity.QueryParam;
-import com.kingdee.bos.webapi.sdk.K3CloudApi;
-import org.apache.http.client.HttpClient;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.List;
-
-@SpringBootTest(classes = ZkqyApplication.class)
-
-public class Test01 {
-
-    @Test
-    public void testA() throws Exception {
-        K3CloudApi api = new K3CloudApi();
-        List datacenter = api.getDataCenters();
-        Gson gson = new Gson();
-        System.out.printf("或则环境账套信息：%s%n",gson.toJson(datacenter));
-        System.out.println("ddddd");
-
-        //注意 1：此处不再使用参数形式传入用户名及密码等敏感信息，改为在登录配置文件中设置。
-        //注意 2：必须先配置第三方系统登录授权信息后，再进行业务操作，详情参考各语言版本SDK介绍中的登录配置文件说明。
-        //读取配置，初始化SDK
-//        K3CloudApi client = new K3CloudApi();
-        //请求参数，要求为json字符串
-//        String jsonData = "{\"FormId\":\"FBottomEntity\",\"FieldKeys\":\"FMATERIALNAME2\",\"FilterString\":[],\"OrderString\":\"\",\"TopRowCount\":0,\"StartRow\":0,\"Limit\":2000,\"SubSystemId\":\"\"}";
-//        try {
-//           //调用接口
-//            String resultJson = String.valueOf(api.executeBillQuery(jsonData));
-//            System.out.println("接口返回结果: " + resultJson);
-//        } catch (Exception e) {
-////            fail(e.getMessage());
-//           System.out.println(e.getMessage());
-//        }
-    }
-
-
-    @Test
-    public  void  test02() throws Exception {
-        IdentifyInfo identifyInfo=new IdentifyInfo();
-        identifyInfo.setAppId("291472_5Z6q2/Ho6roeQaXv0d5PS61FQrTa0PNs");
-        identifyInfo.setAppSecret("18d80a2709c7446ea44aa14b7d94e86e");
-        identifyInfo.setServerUrl("http://kdcloudserver/K3Cloud/");
-        identifyInfo.setUserName("王金明");
-        identifyInfo.setPwd("123456");
-        identifyInfo.setConnectTimeout(300);
-        identifyInfo.setdCID("61c7dd2d0ff564");
-        identifyInfo.setRequestTimeout(300);
-//        K3CloudApi client = new K3CloudApi(identifyInfo);
-//        String jsonData = "{\"FormId\":\"FBottomEntity\",\"FieldKeys\":\"FMATERIALNAME2\",\"FilterString\":[],\"OrderString\":\"\",\"TopRowCount\":0,\"StartRow\":0,\"Limit\":2000,\"SubSystemId\":\"\"}";
-//        try {
-//            //调用接口
-//            String resultJson = String.valueOf(client.executeBillQuery(jsonData));
-//            System.out.println("接口返回结果: " + resultJson);
-//        } catch (Exception e) {
-////            fail(e.getMessage());
-//            System.out.println(e.getMessage());
-//        }
-        K3CloudApi api = new K3CloudApi();
-
-        List datacenter = api.getDataCenters();
-        Gson gson = new Gson();
-        System.out.printf("或则环境账套信息：%s%n",gson.toJson(datacenter));
-        System.out.println("ddddd");
-    }
-}
-
-
-

zkqy-framework/src/main/java/com/zkqy/framework/sso_oauth2/controller/ThirdPartLoginController.java

@@ -57,13 +57,12 @@ public class ThirdPartLoginController {
             map.put("grant_type", "authorization_code");
             map.put("redirect_uri", CALLBACK);
             map.put("code", code);
-            map.put("client_id", "mestools");
-//            map.put("client_id", "hmc");
+//            map.put("client_id", "mestools");
+            map.put("client_id", "hmc");
 //            if(name.equals("")&&name!=
 //            null){
 //                map.put("client_id", "mestools");
 //            }else {
-//
 //            }
             map.put("client_secret", "zkqy8888");
             // 获取token请求头

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/StationInformation.java

@@ -78,6 +78,18 @@ public class StationInformation extends BaseEntity
     @Excel(name = "班组编码")
     private String teamCode;
 
+    /** 班组类型 */
+    @Excel(name = "班组类型")
+    private String stationType;
+
+    public String getStationType() {
+        return stationType;
+    }
+
+    public void setStationType(String stationType) {
+        this.stationType = stationType;
+    }
+
     public String getTeamCode() {
         return teamCode;
     }

zkqy-fujian-amichi/src/main/resources/mapper/StationInformationMapper.xml

@@ -26,11 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="taskNodeKey"    column="task_node_key"    />
         <result property="teamName"    column="team_name"    />
         <result property="teamCode"    column="team_code"    />
+        <result property="stationType" column="station_type"></result>
     </resultMap>
 
     <sql id="selectStationInformationVo">
         select id, station_code, station_name, personnel_id, personnel_name, device_id, device_name, remark, create_by_id, create_by,
-               create_time, update_by_id, update_by, update_time, del_flag, data_approval_status, process_key, task_process_key, task_node_key,team_name,team_code
+               create_time, update_by_id, update_by, update_time, del_flag, data_approval_status, process_key, task_process_key, task_node_key,team_name,team_code,station_type
         from fjqydb.station_information
     </sql>
 
@@ -56,7 +57,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         si.task_process_key,
         si.task_node_key,
         ti.team_name as team_name ,
-        si.team_code
+        si.team_code,
+        si.station_type
         from fjqydb.station_information as si
         left join fjqydb.team_information as  ti
         on (si.team_code=ti.team_code)
@@ -75,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNodeKey != null  and taskNodeKey != ''"> and si.task_node_key = #{taskNodeKey}</if>
             <if test="teamName != null  and teamName != ''"> and ti.team_name = #{teamName}</if>
             <if test="teamCode != null  and teamCode != ''"> and si.team_code = #{teamCode}</if>
+            <if test="stationType!=null and stationType!=''">and si.station_type=#{stationType}</if>
         </where>
     </select>
     
@@ -105,7 +108,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskProcessKey != null">task_process_key,</if>
             <if test="taskNodeKey != null">task_node_key,</if>
             <if test="teamName != null  and teamName != ''">team_name,</if>
-            <if test="teamCode != null  and teamCode != ''">team_code</if>
+            <if test="teamCode != null  and teamCode != ''">team_code,</if>
+            <if test="stationType!=null and stationType!=''">station_type</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stationCode != null">#{stationCode},</if>
@@ -127,7 +131,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskProcessKey != null">#{taskProcessKey},</if>
             <if test="taskNodeKey != null">#{taskNodeKey},</if>
             <if test="teamName != null  and teamName != ''">#{teamName},</if>
-            <if test="teamCode != null  and teamCode != ''">#{teamCode}</if>
+            <if test="teamCode != null  and teamCode != ''">#{teamCode},</if>
+            <if test="stationType!=null and stationType!=''">#{stationType}</if>
          </trim>
     </insert>
 
@@ -152,7 +157,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="processKey != null">process_key = #{processKey},</if>
             <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
-            <if test="teamName != null  and teamName != ''">team_name=#{teamName}</if>
+            <if test="teamName != null  and teamName != ''">team_name=#{teamName},</if>
+            <if test="stationType!=null and stationType!=''">station_type=#{stationType}</if>
         </trim>
         where id = #{id}
     </update>
@@ -179,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
             <if test="teamName != null">team_name=#{teamName},</if>
             <if test="teamCode != null">team_code=#{teamCode},</if>
+            <if test="stationType!=null and teamCode != ''">station_type=#{stationType}</if>
         </trim>
         where station_code = #{stationCode}
     </update>
@@ -206,7 +213,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="taskProcessKey != null">task_process_key = #{taskProcessKey},</if>
             <if test="taskNodeKey != null">task_node_key = #{taskNodeKey},</if>
             <if test="teamName != null  and teamName != ''">team_name=#{teamName},</if>
-            <if test="teamCode != null  and teamCode != ''">team_code=#{teamCode}</if>
+            <if test="teamCode != null  and teamCode != ''">team_code=#{teamCode},</if>
+            <if test="stationType!=null and teamCode != ''">station_type=#{stationType}</if>
         </trim>
         where device_name = #{deviceName}
     </update>

zkqy-laboratory-information/src/main/resources/mapper/EntrustedInformationMapper.xml

@@ -121,10 +121,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and ei.lot like concat('%', #{lot}, '%')
             </if>
             <if test="startTime != null">
-                <![CDATA[ and ei.create_time >= #{startTime}]]>
+                <![CDATA[ and DATE(ei.create_time) >= #{startTime}]]>
             </if>
             <if test="endTime != null">
-                <![CDATA[ and ei.create_time <= #{endTime}]]>
+                <![CDATA[ and DATE(ei.create_time) <= #{endTime}]]>
             </if>
             <if test="orderStatus != null  and orderStatus != ''"> and ei.order_status = #{orderStatus}</if>
             <if test="createBy != null "> and ei.create_by = #{createBy}</if>

zkqy-ui/src/api/amichi/user/user.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+//查询当前租户的用户信息
+export function listUserInformation() {
+  return request({
+    url: '/system/user/list',
+    method: 'get',
+  })
+}

zkqy-ui/src/views/lims/wtform/wtFormIndex.vue

@@ -1763,7 +1763,7 @@ export default {
                 this.$set(this.wtform, 'customerViceTag',data.data.customerViceTag)
                 this.jctableData = [];
                 //查询所有的检测信息
-                this.jcQueryParams.pageSize = 2;
+                this.jcQueryParams.pageSize = 4;
                 this.phisFlag=true;
               }
             });
@@ -1799,7 +1799,7 @@ export default {
                 this.$set(this.wtform, 'customerViceTag',data.data.customerViceTag)
                 this.jctableData=[];
                 //查询所有的检测信息
-                this.jcQueryParams.pageSize=2;
+                this.jcQueryParams.pageSize=4;
               }
             });
 

zkqy-ui/vue.config.js

@@ -7,7 +7,7 @@ function resolve(dir) {
 const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
 
 const CompressionPlugin = require('compression-webpack-plugin')
-
+// Lims实验室信息管理系统
 const name = process.env.VUE_APP_TITLE || '生产协同管理系统' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 1025 // 端口
@@ -38,10 +38,11 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-         // target: `http://192.168.110.52:8066`,
-        // target: `http://192.168.110.83:8066`,
-        //  target: `http://192.168.128.171:8066`,
+         // target: `http://172.20.10.5:8066`,
         target: `http://192.168.110.83:8066`,
+         //target: `http://192.168.128.171:8066`,
+        // target: `http://192.168.2.135:8066`,
+        // target: `http://192.168.2.127:8066`,
         // target: `http://192.168.0.17:8072`,
         changeOrigin: true,
         pathRewrite: {