Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/appsettings.json

@@ -10,8 +10,8 @@
     //"Default": "Server=127.0.0.1;Database=ABP;user id=sa;Password=1",
     //"SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;Password=1;"
     "Default": "Server=127.0.0.1;Database=ABP;User ID=sa;Password=1;",
-    "SettleAccountService": "Server=127.0.0.1;Database=SettleAccountService;user id=sa;password=1;",
+    "SettleAccountService": "Server=192.168.0.67;Database=SettleAccountService;user id=sa;password=Microsoft2008;",
-    "Wms": "Server=127.0.0.1;Database=CPAT_WMS;user id=sa;password=1;"
+    "Wms": "Server=192.168.0.67;Database=CPAT_WMS;user id=sa;password=Microsoft2008;"
 
   },
   "Logging": {

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs

@@ -54,7 +54,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// wms出库
     /// </summary>
 
-    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
+    //[Authorize(SettleAccountPermissions.WMSJIT.Default)]
     [Route("api/settleaccount/wmsjitoutput")]
 
     public class WMSJitAppService :
@@ -557,6 +557,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsJitOutPut-Cancel")]
+        [UnitOfWork(false)]
         [Authorize(SettleAccountPermissions.WMSJIT.Delete)]
         public async Task<bool> WmsJitOutPutCancel(WmsJitRequestDto input)
         {
@@ -572,7 +573,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
                string str= string.Join(",",_ls.ToArray());
 
-                var sql = "DECLARE	@return_value int\n" +
+               var sql = "DECLARE	@return_value int\n" +
                           "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
                           "     @Guids ='{0}', \n" +
                           "		@billnum = N'{1}',\n" +

vue/package.json

@@ -73,7 +73,7 @@
     "vue": "2.6.10",
     "vue-bus": "^1.2.1",
     "vue-count-to": "1.0.13",
-    "vue-cropper": "^0.5.5",
+    "vue-cropper": "^0.5.8",
     "vue-i18n": "7.3.2",
     "vue-infinite-scroll": "^2.0.2",
     "vue-lazyload": "^1.3.3",
@@ -89,10 +89,10 @@
     "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-eslint": "^3.9.1",
-    "@vue/cli-plugin-unit-jest": "^4.5.9",
+    "@vue/cli-plugin-unit-jest": "^4.5.15",
-    "@vue/cli-service": "^4.5.9",
+    "@vue/cli-service": "^4.5.15",
     "@vue/test-utils": "1.0.0-beta.29",
-    "autoprefixer": "^9.5.1",
+    "autoprefixer": "^9.8.8",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "^26.6.3",
@@ -104,6 +104,7 @@
     "html-webpack-plugin": "3.2.0",
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
+    "mini-css-extract-plugin": "^2.4.6",
     "mockjs": "1.0.1-beta3",
     "node-sass": "^4.14.1",
     "plop": "2.3.0",
@@ -113,12 +114,13 @@
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
-    "serve-static": "^1.13.2",
+    "serve-static": "^1.14.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",
     "vue-happy-scroll": "^2.1.1",
     "vue-template-compiler": "2.6.10",
-    "webpack": "^5.54.0"
+    "webpack": "^4.46.0",
+    "webpack-cli": "^4.9.1"
   },
   "engines": {
     "node": ">=8.9",

vue/src/router/index.js

@@ -65,6 +65,8 @@ export const constantRoutes = [
   {
     path: '/login',
     component: () => import('@/views/login/index'),
+		//component: () => import('@/views/pg-fis/basedate/partSwitch'), //?? one
+		//component: () => import('@/views/pg-fis/basedate/assemblyCfg'), //?? one
     hidden: true
   },
   {

vue/src/views/pg-fis/basedate/m100Online/RepetitionMB.vue

@@ -594,7 +594,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/RepetitionZHB.vue

@@ -549,7 +549,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +
@@ -692,7 +692,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/ScrapMB.vue

@@ -614,7 +614,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/ScrapZHB.vue

@@ -612,7 +612,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/budaMB.vue

@@ -529,7 +529,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/budaZHB.vue

@@ -529,7 +529,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
 							
               console.log(

vue/src/views/pg-fis/basedate/m100Online/detailMB.vue

@@ -583,7 +583,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/detailZHB.vue

@@ -564,7 +564,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +

vue/src/views/pg-fis/basedate/m100Online/index-old.vue

@@ -1225,7 +1225,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1263,7 +1263,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1307,7 +1307,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1350,7 +1350,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1403,7 +1403,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "menban";
                 this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1446,7 +1446,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "zhuhuban";
                 this.fileQuery.dataname = JSON.stringify(response.item);

vue/src/views/pg-fis/basedate/m100Online/index.vue

@@ -1266,7 +1266,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1304,7 +1304,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1348,7 +1348,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1391,7 +1391,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1444,7 +1444,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "menban";
                 this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1487,7 +1487,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "zhuhuban";
                 this.fileQuery.dataname = JSON.stringify(response.item);

vue/src/views/pg-fis/basedate/m100Online/normalPritIndex.vue

@@ -1548,7 +1548,7 @@ export default {
                                 type: "error",
                               });
                               return;
-                            } else {
+                            } else if (response.status === true) {
                               //传给grid++接口json数据，得到返回的文件base64
                               //this.fileQuery.report = "menban";
                               this.fileQuery.dataname = JSON.stringify(
@@ -1599,7 +1599,7 @@ export default {
                         
                           this.isDisable=false;
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1682,7 +1682,7 @@ export default {
                                 type: "error",
                               });
                               return;
-                            } else {
+                            } else if (response.status === true) {
                               //传给grid++接口json数据，得到返回的文件base64
                               //this.fileQuery.report = "menban";
                               this.fileQuery.dataname = JSON.stringify(
@@ -1731,7 +1731,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1906,7 +1906,7 @@ export default {
                       type: "error",
                     });
                     return;
-                  } else {
+                  } else if (response.status === true) {
                     //传给grid++接口json数据，得到返回的文件base64
                     //this.fileQuery.report = "menban";
                     this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1949,7 +1949,7 @@ export default {
                       type: "error",
                     });
                     return;
-                  } else {
+                  } else if (response.status === true) {
                     //传给grid++接口json数据，得到返回的文件base64
                     //this.fileQuery.report = "zhuhuban";
                     this.fileQuery.dataname = JSON.stringify(response.item);
@@ -2075,7 +2075,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -2120,7 +2120,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -2190,7 +2190,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -2231,7 +2231,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -2284,7 +2284,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "menban";
                 this.fileQuery.dataname = JSON.stringify(response.item);
@@ -2327,7 +2327,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "zhuhuban";
                 this.fileQuery.dataname = JSON.stringify(response.item);

vue/src/views/pg-fis/basedate/select/detailMB.vue

@@ -583,7 +583,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "门板-调用Handlers/Handler1.ashx?report=menban传的值：" +

vue/src/views/pg-fis/basedate/select/detailZHB.vue

@@ -564,7 +564,7 @@ export default {
                 type: "error",
               });
               return;
-            } else {
+            } else if (response.status === true) {
               this.fileQuery.dataname = JSON.stringify(response.item);
               console.log(
                 "柱板-调用Handlers/Handler1.ashx?report=zhuhuban传的值：" +

vue/src/views/pg-fis/basedate/select/index.vue

@@ -1224,7 +1224,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1262,7 +1262,7 @@ export default {
                             type: "error",
                           });
                           return;
-                        } else {
+                        } else if (response.status === true) {
                           //传给grid++接口json数据，得到返回的文件base64
                           //this.fileQuery.report = "menban";
                           this.fileQuery.dataname = JSON.stringify(
@@ -1306,7 +1306,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1349,7 +1349,7 @@ export default {
                         type: "error",
                       });
                       return;
-                    } else {
+                    } else if (response.status === true) {
                       //传给grid++接口json数据，得到返回的文件base64
                       //this.fileQuery.report = "menban";
                       this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1402,7 +1402,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "menban";
                 this.fileQuery.dataname = JSON.stringify(response.item);
@@ -1445,7 +1445,7 @@ export default {
                   type: "error",
                 });
                 return;
-              } else {
+              } else if (response.status === true) {
                 //传给grid++接口json数据，得到返回的文件base64
                 //this.fileQuery.report = "zhuhuban";
                 this.fileQuery.dataname = JSON.stringify(response.item);

vue/static/config.js

@@ -3,11 +3,13 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
 			//ip: 'http://192.168.0.63',
-      ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
+			//ip: 'http://192.168.0.140',
+			ip: 'http://127.0.0.1', //?? two
       auth_port: '8066',
       public_port: '8092',
-      backend_port: '8092'
+      //backend_port: '8092',
+			backend_port: '44344', //?? three
     },
     basic: {},
     upload: {
@@ -46,6 +48,7 @@ if (process.env.NODE_ENV === 'development') {
       auth_port: '8066',
       public_port: '8092',
       backend_port: '8092'
+			
     },
     basic: {},
     upload: {