Home Explore Help
Register Sign In
zkqy-sass-platform
/
mec-cloud_-intelligent-manufacturing_client
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	zkqy-admin/src/main/resources/application-druid.yml
#	zkqy-admin/src/main/resources/application.yml
#	zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductCodeAListController.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/controller/ProductCodeLogController.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/controller/SaleAccountsReceivableDetailController.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/domain/ProductCodeAList.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/domain/ProductCodeLog.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/mapper/ProductCodeAListMapper.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/mapper/ProductCodeLogMapper.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/mapper/SaleProductsMapper.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeAListService.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeLogService.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanServiceImpl.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductCodeAListServiceImpl.java
#	zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductCodeLogServiceImpl.java
#	zkqy-custom-business/src/main/resources/mapper/business/ProductCodeAListMapper.xml
#	zkqy-custom-business/src/main/resources/mapper/business/ProductCodeLogMapper.xml
#	zkqy-custom-business/src/main/resources/mapper/business/SaleProductsMapper.xml
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/ProductionPlanningManagementController.java
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/PlanTaskDetailsMapper.java
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionCardFlowMapper.java
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/mapper/ProductionPlanningManagementMapper.java
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/IProductionPlanningManagementService.java
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/ProductionPlanningManagementServiceImpl.java
#	zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java
#	zkqy-fujian-amichi/src/main/resources/mapper/PlanTaskDetailsMapper.xml
#	zkqy-fujian-amichi/src/main/resources/mapper/ProductionCardFlowMapper.xml
#	zkqy-fujian-amichi/src/main/resources/mapper/ProductionPlanningManagementMapper.xml
#	zkqy-fujian-amichi/src/main/resources/mapper/RingScanInformationMapper.xml
#	zkqy-ui/.env.development
#	zkqy-ui/.env.production
#	zkqy-ui/src/api/amichi/productionCardFlow/productionCardFlow.js
#	zkqy-ui/src/api/business/productcodelog.js
#	zkqy-ui/src/api/productcodelog/productcodelog.js
#	zkqy-ui/src/views/amichi/planTask/salesPlan.vue
#	zkqy-ui/src/views/login.vue
#	zkqy-ui/src/views/orderMange/index.vue
#	zkqy-ui/vue.config.js
lucky 3 months ago
parent
7043794527 6e5a246a1c
commit
b7f87f8376
9 changed files with 22 additions and 19 deletions
Split View Show Diff Stats
  1. 1 1
      zkqy-custom-business/src/main/java/com/zkqy/business/controller/SaleAccountsReceivableDetailController.java
  2. 1 0
      zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeAListService.java
  3. 1 0
      zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeLogService.java
  4. 1 1
      zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java
  5. 3 0
      zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java
  6. 3 0
      zkqy-ui/.env.development
  7. 1 0
      zkqy-ui/src/views/amichi/planTask/salesPlan.vue
  8. 5 8
      zkqy-ui/src/views/login.vue
  9. 6 9
      zkqy-ui/vue.config.js

+ 1 - 1
zkqy-custom-business/src/main/java/com/zkqy/business/controller/SaleAccountsReceivableDetailController.java
View File 

@@ -78,7 +78,7 @@ public class SaleAccountsReceivableDetailController extends BaseController {
 
     /**
 
      * 获取应收帐明细详细信息
 
      */
 
-    @PreAuthorize("@ss.hasPermi('system:SaleAccountsReceivableDetail:query')")
 
+    @PreAuthorize("@ss.hasPermi('system:SaleAccountsReceivableDetail:edit')")
 
     @GetMapping(value = "/{id}")
 
     @ApiOperation(value = "获取应收帐明细详细信息")
 
     public AjaxResult getInfo(@PathVariable("id") Long id) {

+ 1 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeAListService.java
View File 

@@ -1,3 +1,4 @@
 
+
 
 package com.zkqy.business.service;
 
 
 import java.util.List;

+ 1 - 0
zkqy-custom-business/src/main/java/com/zkqy/business/service/IProductCodeLogService.java
View File 

@@ -1,3 +1,4 @@
 
+
 
 package com.zkqy.business.service;
 
 
 import java.util.List;

+ 1 - 1
zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java
View File 

@@ -331,7 +331,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
 
                 saleProductsList2.add(saleProducts);
 
             }
 
             saleProducts.setOnBoardState(item.getPlanStatus());//状态信息
 
-//            saleProducts.setProductNumber(Double.valueOf(item.getNumber()));//数量
 
+            //saleProducts.setProductNumber(Double.valueOf(item.getNumber()));//数量
 
 
             //原来的色号
 
             String colours = saleProducts1.getColours();

+ 3 - 0
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java
View File 

@@ -980,9 +980,12 @@ public class StationInformationServiceImpl implements IStationInformationService
 
             newRingScanInformationFirst.setProductionOrderNumber(ringScanInformation.getProductionOrderNumber());
 
             newRingScanInformationFirst.setInspectionQuantity(i2.toString());
 
 
+
 
             //入库数量跟随,成品检验同步更新
 
             newRingScanInformationFirst.setRks(i2.toString());
 
 
+
 
+
 
             return newRingScanInformationFirst;
 
         }else if(type.equals("3")) {//入库
 
             String rKQuantity = ringScanInformationFirstNumber;

+ 3 - 0
zkqy-ui/.env.development
View File 

@@ -8,6 +8,7 @@ ENV = 'development'
 
 VUE_APP_BASE_API = '/dev-api'
 
 
 # 图片路径
 
+VUE_APP_BASE_IMG_API = 'http://192.168.110.182:1025/dev-api'
 
 #VUE_APP_BASE_IMG_API = 'http://192.168.2.127:1024/dev-api'
 
 VUE_APP_BASE_IMG_API = 'http://192.168.110.83:1025/dev-api'
 
 
@@ -15,6 +16,8 @@ VUE_APP_BASE_IMG_API = 'http://192.168.110.83:1025/dev-api'
 
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 
 #本项目地址
 
+VUE_APP_BASE_API1 = 'http://192.168.110.182:8066/'
 
+
 
 # VUE_APP_BASE_API1 = 'http://192.168.110.15:8066/'
 
 # VUE_APP_BASE_API1 = 'http://192.168.110.120:8066/'
 
 # VUE_APP_BASE_API1 = 'http://192.168.110.76:8066/'

+ 1 - 0
zkqy-ui/src/views/amichi/planTask/salesPlan.vue
View File 

@@ -605,6 +605,7 @@ import {
 
 } from "@/api/amichi/productionCardFlow/productionCardFlow";
 
 
 
+
 
 export default {
 
   name: "listInfo",
 
   dicts: ["schedule_type","tczt","scheduling_state",'djlx','scddzt'],

+ 5 - 8
zkqy-ui/src/views/login.vue
View File 

@@ -307,14 +307,11 @@ export default {
 
             Cookies.remove("rememberMe");
 
           }
 
           let form = {
 
-                // uri: "?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.190:8066/oauth/callback",
 
-               // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://175.27.169.173:8066/oauth/callback",
 
-               //uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",
 
-            //uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",
 
-              uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
 
-             //  uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",
 
-            // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://172.20.10.5:8066/oauth/callback",
 
-            //   uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.3.17:8066/oauth/callback",
 
+            // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.128.171:8066/oauth/callback",//实验室
 
+            // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.2.135:8066/oauth/callback",//铨一
 
+            // uri:"?client_id=mestools&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.3.17:8066/oauth/callback",//化纤
 
+            // uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.83:8066/oauth/callback",//hmc
 
+             uri:"?client_id=hmc&scope=basic&response_type=code&state=AB1357&redirect_uri=http://192.168.110.182:8066/oauth/callback",//lth
 
             ...this.loginForm,
 
             tenantID: this.tenantId,
 
           };

+ 6 - 9
zkqy-ui/vue.config.js
View File 

@@ -38,15 +38,12 @@ module.exports = {
 
     proxy: {
 
       // detail: https://cli.vuejs.org/config/#devserver-proxy
 
       [process.env.VUE_APP_BASE_API]: {
 
-         // target: `http://172.20.10.5:8066`,
 
-         // target: `http://175.27.169.173: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.190:8066`,
 
-        // target: `http://192.168.3.17:8066`,
 
-        //  target: `http://192.168.2.135:8066`,
 
-        //  target: `http://192.168.128.171:8066`,
 
+
 
+        // target: `http://192.168.128.171:8066`, //实验室
 
+        // target: `http://192.168.2.135:8066`, //铨一开发
 
+        // target: `http://192.168.3.17:8066`, //化纤服务器
 
+        //  target: `http://192.168.110.182:8066`, //lth
 
+        target: `http://192.168.110.83:8066`, //hmc
 
         // target: `http://175.27.169.173:8066`,//公网服务器
 
         changeOrigin: true,
 
         pathRewrite: {