feat:金蝶集成框架

zkqy-admin/pom.xml

@@ -91,12 +91,27 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
+            <artifactId>spring-boot-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
     </dependencies>
 

zkqy-admin/src/main/java/com/zkqy/ZkqyApplication.java

@@ -20,6 +20,7 @@ public class ZkqyApplication
 {
     public static void main(String[] args)
     {
+
         SpringApplication.run(ZkqyApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  中科擎云智能制造平台客户端后台启动成功   ლ(´ڡ`ლ)ﾞ  \n"+
                 "        CCCCCCCCCCCCCLLLLLLLLLLL             IIIIIIIIIIEEEEEEEEEEEEEEEEEEEEEENNNNNNNN        NNNNNNNNTTTTTTTTTTTTTTTTTTTTTTT\n" +

zkqy-admin/src/main/resources/kdwebapi.properties

@@ -0,0 +1,18 @@
+# \u7B2C\u4E09\u65B9\u7CFB\u7EDF\u767B\u5F55\u6388\u6743\u7684\u8D26\u5957ID
+X-KDApi-AcctID = 61c7dd2d0ff564
+# \u7B2C\u4E09\u65B9\u7CFB\u7EDF\u767B\u5F55\u6388\u6743\u7684\u7528\u6237
+X-KDApi-UserName =\u738B\u91D1\u660E
+# \u7B2C\u4E09\u65B9\u7CFB\u7EDF\u767B\u5F55\u6388\u6743\u7684\u5E94\u7528ID
+X-KDApi-AppID = 291472_5Z6q2/Ho6roeQaXv0d5PS61FQrTa0PNs
+# \u7B2C\u4E09\u65B9\u7CFB\u7EDF\u767B\u5F55\u6388\u6743\u7684\u5E94\u7528\u5BC6\u94A5
+X-KDApi-AppSec = 18d80a2709c7446ea44aa14b7d94e86e
+# \u670D\u52A1Url\u5730\u5740(\u516C\u6709\u4E91\u7EDF\u4E00\u8D70\u7F51\u5173sdk\u5E95\u5C42\u5DF2\u5904\u7406\uFF0C\u65E0\u9700\u4F20X-KDApi-ServerUrl,\u4E0B\u9762\u8FD9\u884C\u9700\u8981\u6CE8\u91CA)
+X-KDApi-ServerUrl =http://kdcloudserver/K3Cloud/
+# \u8D26\u5957\u8BED\u7CFB\uFF0C\u9ED8\u8BA42052
+ X-KDApi-LCID = 2052
+# \u7EC4\u7EC7\u7F16\u7801\uFF0C\u542F\u7528\u591A\u7EC4\u7EC7\u65F6\u914D\u7F6E\u5BF9\u5E94\u7684\u7EC4\u7EC7\u7F16\u7801\u624D\u6709\u6548
+# X-KDApi-OrgNum = 100
+# \u5141\u8BB8\u7684\u6700\u5927\u8FDE\u63A5\u5EF6\u65F6\uFF0C\u5355\u4F4D\u4E3A\u79D2
+X-KDApi-ConnectTimeout=10000000
+# \u5141\u8BB8\u7684\u6700\u5927\u8BFB\u53D6\u5EF6\u65F6\uFF0C\u5355\u4F4D\u4E3A\u79D2
+X-KDApi-RequestTimeout=10000000

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

@@ -0,0 +1,75 @@
+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-fujian-amichi/pom.xml

@@ -26,11 +26,22 @@
             <artifactId>zkqy-process-execution</artifactId>
             <version>3.8.5</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
             <version>1.6.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-custom-business</artifactId>
+            <version>3.8.5</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/AutomaticSchedulingOnSiteController.java

@@ -3,12 +3,12 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.AutomaticSchedulingOnSite;
 import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.core.page.TableDataInfo;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.common.utils.PageUtils;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.zkqy.amichi.domain.AutomaticSchedulingOnSite;
 import com.zkqy.amichi.service.IAutomaticSchedulingOnSiteService;
 
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/BillOfMaterialsController.java

@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.BillOfMaterials;
 import com.zkqy.amichi.domain.vo.BillOfMaterialsVo;
 import com.zkqy.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
@@ -24,7 +25,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.BillOfMaterials;
 import com.zkqy.amichi.service.IBillOfMaterialsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/CustomerInformationController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.CustomerInformation;
 import com.zkqy.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.CustomerInformation;
 import com.zkqy.amichi.service.ICustomerInformationService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ExceptionReportInformationSheetController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.ExceptionReportInformationSheet;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ExceptionReportInformationSheet;
 import com.zkqy.amichi.service.IExceptionReportInformationSheetService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ExportproductionschedulingController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.Exportproductionscheduling;
 import com.zkqy.amichi.domain.vo.ExportproductionschedulingArgumentVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.Exportproductionscheduling;
 import com.zkqy.amichi.service.IExportproductionschedulingService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/FinishedGoodsInventoryController.java

@@ -1,8 +1,9 @@
 package com.zkqy.amichi.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.FinishedGoodsInventory;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.FinishedGoodsInventory;
 import com.zkqy.amichi.service.IFinishedGoodsInventoryService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/FinishedGoodsInventoryLogController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.FinishedGoodsInventoryLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.FinishedGoodsInventoryLog;
 import com.zkqy.amichi.service.IFinishedGoodsInventoryLogService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ManhourController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.Manhour;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.Manhour;
 import com.zkqy.amichi.service.IManhourService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/MaterialInfoController.java

@@ -3,26 +3,16 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zkqy.amichi.domain.ProductionBoms;
-import com.zkqy.amichi.domain.ProductionTasks;
-import com.zkqy.amichi.domain.TaskDetails;
-import com.zkqy.amichi.domain.vo.ProductionPlanningManagementVo;
-import com.zkqy.amichi.mapper.ProductionBomsMapper;
-import com.zkqy.amichi.mapper.ProductionPlanningManagementMapper;
-import com.zkqy.amichi.mapper.ProductionTasksMapper;
-import com.zkqy.amichi.mapper.TaskDetailsMapper;
-import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.amichi.domain.MaterialInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.parameters.P;
 import org.springframework.web.bind.annotation.*;
 import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.MaterialInfo;
 import com.zkqy.amichi.service.IMaterialInfoService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/MaterialtransactionlogController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.Materialtransactionlog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.Materialtransactionlog;
 import com.zkqy.amichi.service.IMaterialtransactionlogService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/OnSiteProgramDetailsController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.OnSiteProgramDetails;
 import com.zkqy.amichi.domain.vo.OnSiteProgramDetailsVo;
 import com.zkqy.amichi.domain.vo.ProductionPlanningManagementVo;
 import io.swagger.annotations.Api;
@@ -21,7 +22,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.OnSiteProgramDetails;
 import com.zkqy.amichi.service.IOnSiteProgramDetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/OrderforgoodsController.java

@@ -1,11 +1,7 @@
 
 package com.zkqy.amichi.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
 import com.zkqy.amichi.service.IOrderforgoodsService;
-import com.zkqy.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -13,12 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
-import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.StationInformation;
-import com.zkqy.amichi.service.IStationInformationService;
-import com.zkqy.common.utils.poi.ExcelUtil;
-import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 订单取消Controller

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/PlanTaskDetailsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.PlanTaskDetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.PlanTaskDetails;
 import com.zkqy.amichi.service.IPlanTaskDetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/PlannedPurchaseLogController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.PlannedPurchaseLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.PlannedPurchaseLog;
 import com.zkqy.amichi.service.IPlannedPurchaseLogService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/PocurementdetailsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.Pocurementdetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.Pocurementdetails;
 import com.zkqy.amichi.service.IPocurementdetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductDeliverySheetController.java

@@ -1,8 +1,9 @@
-package  com.zkqy.amichi.controller;
+package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.ProductDeliverySheet;
 import com.zkqy.amichi.domain.vo.ProductDeliverySheetVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,8 +21,7 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import  com.zkqy.amichi.domain.ProductDeliverySheet;
-import  com.zkqy.amichi.service.IProductDeliverySheetService;
+import com.zkqy.amichi.service.IProductDeliverySheetService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductDeliverySheetDetailsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.ProductDeliverySheetDetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ProductDeliverySheetDetails;
 import com.zkqy.amichi.service.IProductDeliverySheetDetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductionBomsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.ProductionBoms;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ProductionBoms;
 import com.zkqy.amichi.service.IProductionBomsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductionBomsDetailsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.ProductionBomsDetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ProductionBomsDetails;
 import com.zkqy.amichi.service.IProductionBomsDetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductionPlanningManagementController.java

@@ -3,7 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zkqy.amichi.domain.Exportproductionscheduling;
+import com.zkqy.amichi.domain.ProductionPlanningManagement;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -20,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ProductionPlanningManagement;
 import com.zkqy.amichi.service.IProductionPlanningManagementService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductionTasksController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.ProductionTasks;
 import com.zkqy.amichi.domain.vo.ProductionTasksVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ProductionTasks;
 import com.zkqy.amichi.service.IProductionTasksService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/PurchaseOrderController.java

@@ -3,7 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.zkqy.amichi.domain.PlannedPurchaseLog;
+import com.zkqy.amichi.domain.PurchaseOrder;
 import com.zkqy.amichi.domain.vo.PlanPurchaseOrder;
 import com.zkqy.amichi.domain.vo.PurchaseOrderVo;
 import io.swagger.annotations.Api;
@@ -22,7 +22,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.PurchaseOrder;
 import com.zkqy.amichi.service.IPurchaseOrderService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ReportInformationSheetController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.ReportInformationSheet;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.ReportInformationSheet;
 import com.zkqy.amichi.service.IReportInformationSheetService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/SchedulingProcessTimeController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.SchedulingProcessTime;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.SchedulingProcessTime;
 import com.zkqy.amichi.service.ISchedulingProcessTimeService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/SemiFinishedMaterialListController.java

@@ -3,12 +3,12 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.SemiFinishedMaterialList;
 import com.zkqy.amichi.domain.vo.SemiFinishedMaterialListVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -21,7 +21,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.SemiFinishedMaterialList;
 import com.zkqy.amichi.service.ISemiFinishedMaterialListService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/StationInformationController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.StationInformation;
 import com.zkqy.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,7 +14,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.StationInformation;
 import com.zkqy.amichi.service.IStationInformationService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/StoreEntryDetailsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.StoreEntryDetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.StoreEntryDetails;
 import com.zkqy.amichi.service.IStoreEntryDetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/TaskDetailsController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.TaskDetails;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.TaskDetails;
 import com.zkqy.amichi.service.ITaskDetailsService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/TeamInformationController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.TeamInformation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.TeamInformation;
 import com.zkqy.amichi.service.ITeamInformationService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/TeamPersonnelChangeInformationController.java

@@ -2,6 +2,8 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.TeamPersonnelChangeInformation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +20,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.TeamPersonnelChangeInformation;
 import com.zkqy.amichi.service.ITeamPersonnelChangeInformationService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/TeamPersonnelInformationController.java

@@ -2,6 +2,9 @@ package com.zkqy.amichi.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.zkqy.amichi.domain.TeamPersonnelInformation;
+import com.zkqy.amichi.service.ITeamPersonnelInformationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,8 +21,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.TeamPersonnelInformation;
-import com.zkqy.amichi.service.ITeamPersonnelInformationService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/WarehouseEntryInformationController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.WarehouseEntryInformation;
 import com.zkqy.amichi.domain.vo.ProcessWarehousingVo;
 import com.zkqy.amichi.domain.vo.WarehouseEntryInformationVo;
 import com.zkqy.common.utils.SecurityUtils;
@@ -22,7 +23,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.WarehouseEntryInformation;
 import com.zkqy.amichi.service.IWarehouseEntryInformationService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/WorkingprocedureController.java

@@ -3,6 +3,7 @@ package com.zkqy.amichi.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.Workingprocedure;
 import com.zkqy.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +21,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.Workingprocedure;
 import com.zkqy.amichi.service.IWorkingprocedureService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/WorkmanshipController.java

@@ -1,13 +1,12 @@
 package com.zkqy.amichi.controller;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.amichi.domain.Workmanship;
 import com.zkqy.amichi.domain.vo.WorkmanshipTreeVo;
-import com.zkqy.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,7 +23,6 @@ import com.zkqy.common.annotation.Log;
 import com.zkqy.common.core.controller.BaseController;
 import com.zkqy.common.core.domain.AjaxResult;
 import com.zkqy.common.enums.BusinessType;
-import com.zkqy.amichi.domain.Workmanship;
 import com.zkqy.amichi.service.IWorkmanshipService;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import com.zkqy.common.core.page.TableDataInfo;

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

@@ -1,4 +1,4 @@
-package  com.zkqy.amichi.domain;
+package com.zkqy.amichi.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zkqy.common.core.domain.BaseEntity;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/domain/vo/OnSiteProgramDetailsVo.java

@@ -5,7 +5,6 @@ import com.zkqy.amichi.domain.OnSiteProgramDetails;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 public class OnSiteProgramDetailsVo {

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/AutomaticSchedulingOnSiteMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.AutomaticSchedulingOnSite;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/BillOfMaterialsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.BillOfMaterials;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/CustomerInformationMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.CustomerInformation;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ExceptionReportInformationSheetMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ExceptionReportInformationSheet;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ExportproductionschedulingMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Exportproductionscheduling;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/FinishedGoodsInventoryLogMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.FinishedGoodsInventoryLog;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/FinishedGoodsInventoryMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.FinishedGoodsInventory;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ManhourMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Manhour;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/MaterialInfoMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.MaterialInfo;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/MaterialtransactionlogMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Materialtransactionlog;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/OnSiteProgramDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.OnSiteProgramDetails;
 import com.zkqy.amichi.domain.vo.OnSiteProgramDetailsSumVo;
 import org.apache.ibatis.annotations.Mapper;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/OperationInstructionMapper.java

@@ -1,7 +1,8 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
-import  com.zkqy.amichi.domain.OperationInstruction;
+
+import com.zkqy.amichi.domain.OperationInstruction;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/PlanTaskDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.PlanTaskDetails;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/PlannedPurchaseLogMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.PlannedPurchaseLog;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/PocurementdetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Pocurementdetails;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductDeliverySheetDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductDeliverySheetDetails;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductDeliverySheetMapper.java

@@ -1,7 +1,8 @@
-package  com.zkqy.amichi.mapper;
+package com.zkqy.amichi.mapper;
 
 import java.util.List;
-import  com.zkqy.amichi.domain.ProductDeliverySheet;
+
+import com.zkqy.amichi.domain.ProductDeliverySheet;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionBomsDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionBomsDetails;
 import com.zkqy.amichi.domain.vo.ProductionBomsDetailsVo;
 import org.apache.ibatis.annotations.Mapper;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionBomsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionBoms;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionOrderListMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionOrderList;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionPlanningManagementMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionPlanningManagement;
 import com.zkqy.amichi.domain.vo.ProductionPlanningManagementVo;
 import org.apache.ibatis.annotations.Mapper;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionTasksMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionTasks;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/PurchaseOrderMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.PurchaseOrder;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ReportInformationSheetMapper.java

@@ -1,11 +1,10 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ReportInformationSheet;
 import org.apache.ibatis.annotations.Mapper;
 
-import javax.annotation.ManagedBean;
-
 /**
  * 报工日志Mapper接口
  * 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/SchedulingProcessTimeMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.SchedulingProcessTime;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/SemiFinishedMaterialListMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.SemiFinishedMaterialList;
 import com.zkqy.amichi.domain.vo.SemiFinishedMaterialListAndMaterialInventory;
 import com.zkqy.amichi.domain.vo.SemiFinishedMaterialListVo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/StoreEntryDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.StoreEntryDetails;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/TaskDetailsMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.TaskDetails;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/TeamInformationMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.TeamInformation;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/WarehouseEntryInformationMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.WarehouseEntryInformation;
 import com.zkqy.amichi.domain.vo.WarehouseEntryInformationVo;
 import org.apache.ibatis.annotations.Mapper;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/WorkingprocedureMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Workingprocedure;
 import org.apache.ibatis.annotations.Mapper;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/WorkmanshipMapper.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.mapper;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Workmanship;
 import com.zkqy.amichi.domain.vo.WorkmanshipTreeVo;
 import org.apache.ibatis.annotations.Mapper;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IAutomaticSchedulingOnSiteService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.AutomaticSchedulingOnSite;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/ICustomerInformationService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.CustomerInformation;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IExceptionReportInformationSheetService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ExceptionReportInformationSheet;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IExportproductionschedulingService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Exportproductionscheduling;
 import com.zkqy.amichi.domain.vo.ExportproductionschedulingArgumentVo;
 import com.zkqy.common.core.domain.AjaxResult;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IFinishedGoodsInventoryLogService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.FinishedGoodsInventoryLog;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IFinishedGoodsInventoryService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.FinishedGoodsInventory;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IManhourService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Manhour;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IMaterialInfoService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.MaterialInfo;
 import com.zkqy.common.core.domain.AjaxResult;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IMaterialtransactionlogService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Materialtransactionlog;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IOnSiteProgramDetailsService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.OnSiteProgramDetails;
 import com.zkqy.amichi.domain.vo.OnSiteProgramDetailsVo;
 import com.zkqy.amichi.domain.vo.ProductionPlanningManagementVo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IOperationInstructionService.java

@@ -1,8 +1,8 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
-import  com.zkqy.amichi.domain.OperationInstruction;
-import org.apache.ibatis.annotations.Mapper;
+
+import com.zkqy.amichi.domain.OperationInstruction;
 
 /**
  * 作业指导书Service接口

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IOrderforgoodsService.java

@@ -1,7 +1,5 @@
 package com.zkqy.amichi.service;
 
-import com.zkqy.amichi.domain.StationInformation;
-
 public interface IOrderforgoodsService {
     public String updateOrderforgoods(String planNumber);
 }

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IPlanTaskDetailsService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.PlanTaskDetails;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IPlannedPurchaseLogService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.PlannedPurchaseLog;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IPocurementdetailsService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.Pocurementdetails;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductDeliverySheetDetailsService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductDeliverySheetDetails;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductDeliverySheetService.java

@@ -1,7 +1,8 @@
-package  com.zkqy.amichi.service;
+package com.zkqy.amichi.service;
 
 import java.util.List;
-import  com.zkqy.amichi.domain.ProductDeliverySheet;
+
+import com.zkqy.amichi.domain.ProductDeliverySheet;
 import com.zkqy.amichi.domain.vo.ProductDeliverySheetVo;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductionBomsDetailsService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionBomsDetails;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductionBomsService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionBoms;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductionOrderListService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionOrderList;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductionPlanningManagementService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionPlanningManagement;
 import com.zkqy.amichi.domain.vo.ProductionPlanningManagementVo;
 import com.zkqy.common.core.domain.AjaxResult;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductionTasksService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ProductionTasks;
 import com.zkqy.amichi.domain.vo.ProductionTasksVo;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IPurchaseOrderService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.PurchaseOrder;
 import com.zkqy.amichi.domain.vo.PlanPurchaseOrder;
 import com.zkqy.amichi.domain.vo.PurchaseOrderVo;

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IReportInformationSheetService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.ReportInformationSheet;
 import com.zkqy.common.core.domain.AjaxResult;
 

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/ISchedulingProcessTimeService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.SchedulingProcessTime;
 
 /**

zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/ISemiFinishedMaterialListService.java

@@ -1,6 +1,7 @@
 package com.zkqy.amichi.service;
 
 import java.util.List;
+
 import com.zkqy.amichi.domain.SemiFinishedMaterialList;
 import com.zkqy.amichi.domain.vo.SemiFinishedMaterialListVo;
 import com.zkqy.common.core.domain.AjaxResult;