| CC/iWareCC_ASRS/FormCC.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CC/iWareCC_ASRS/ThreadService/05_BZ30(齐套验证)/DataProcess_ValidateQiTao.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| LA24030_LuLiPackageLine_Web/public/config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SDA/iWareSda/Common/Struct/WareSdaStruct.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SDA/iWareSda/Devices/4-Station/StationModel/StationEntity.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
CC/iWareCC_ASRS/FormCC.cs
@@ -259,7 +259,7 @@ new Thread(PushPackageCodeToMes.Handler).Start(); new Thread(PushPaperCutToMes.Handler).Start(); new Thread(DataProcess_ValidateQiTao.Handler).Start(); //*/ #endregion CC/iWareCC_ASRS/ThreadService/05_BZ30(ÆëÌ×ÑéÖ¤)/DataProcess_ValidateQiTao.cs
@@ -35,7 +35,8 @@ SystemWarningMsg._lbl_Alert_DataProcess_ValidateQiTao = string.Empty; try { if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel) //if (SystemValue.isAllowRuning_DataProcess_ValidateQiTao && SystemValue.isStartedModel) if (SystemValue.isStartedModel) { var rgvLocation = StationLocationEnum.BZ30.ToString();
@@ -4,6 +4,6 @@ "VITE_OPEN_CDN": "false", "VITE_PUBLIC_PATH": "", "VITE_SM_PUBLIC_KEY": "0484C7466D950E120E5ECE5DD85D0C90EAA85081A3A2BD7C57AE6DC822EFCCBD66620C67B0103FC8DD280E36C3B282977B722AAEC3C56518EDCEBAFB72C5A05312", //"VITE_API_URL": "http://localhost:5005" "VITE_API_URL": "http://172.17.1.111:5005" //æ£å¼å°å "VITE_API_URL": "http://localhost:5005" //"VITE_API_URL": "http://172.17.1.111:5005" //æ£å¼å°å } LA24030_LuLiPackageLine_Web/src/views/main/WmsOrder/manualFeedKitting/index.vue
@@ -34,7 +34,7 @@ <br /> <div class="detailBox" style="height: calc(65vh)"> <div class="titleTip"> <div class="" v-show="isSuccess == 'æå'"> <div class="" v-show="isSuccess == 'æå' && qiTaoReuslt=='é½å¥' "> <svg t="1732788314050" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11359" width="100" height="100"> <path d="M874.119618 149.859922A510.816461 510.816461 0 0 0 511.997 0.00208a509.910462 509.910462 0 0 0-362.119618 149.857842c-199.817789 199.679789-199.817789 524.581447 0 724.260236a509.969462 509.969462 0 0 0 362.119618 149.857842A508.872463 508.872463 0 0 0 874.119618 874.120158c199.836789-199.679789 199.836789-524.581447 0-724.260236zM814.94268 378.210681L470.999043 744.132295a15.359984 15.359984 0 0 1-5.887994 4.095996c-1.751998 1.180999-2.913997 2.362998-5.276994 2.913997a34.499964 34.499964 0 0 1-13.469986 2.914997 45.547952 45.547952 0 0 1-12.897986-2.303998l-4.095996-2.363997a45.291952 45.291952 0 0 1-7.009992-4.095996l-196.902793-193.789796a34.126964 34.126964 0 0 1-10.555989-25.186973c0-9.37399 3.583996-18.74698 9.98399-25.186974a36.429962 36.429962 0 0 1 50.372947 0l169.98382 167.423824L763.389735 330.220732a37.059961 37.059961 0 0 1 50.371947-1.732998 33.647965 33.647965 0 0 1 11.165988 25.186973 35.544963 35.544963 0 0 1-9.98399 24.575974v-0.04z m0 0" @@ -42,7 +42,17 @@ p-id="11360" ></path> </svg> <p class="okText">è·åæ ç¾ä¿¡æ¯æåï¼</p> <p class="okText">{{_packageCode}} ã{{qiTaoReuslt}}ãï¼</p> </div> <div class="" v-show="isSuccess == 'æå' && qiTaoReuslt=='ä¸é½å¥' "> <svg t="1732842594517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4303" width="100" height="100"> <path d="M549.044706 512l166.189176-166.249412a26.383059 26.383059 0 0 0 0-36.98447 26.383059 26.383059 0 0 0-37.044706 0L512 475.015529l-166.249412-166.249411a26.383059 26.383059 0 0 0-36.98447 0 26.383059 26.383059 0 0 0 0 37.044706L475.015529 512l-166.249411 166.249412a26.383059 26.383059 0 0 0 0 36.98447 26.383059 26.383059 0 0 0 37.044706 0L512 548.984471l166.249412 166.249411a26.383059 26.383059 0 0 0 36.98447 0 26.383059 26.383059 0 0 0 0-37.044706L548.984471 512zM512 1024a512 512 0 1 1 0-1024 512 512 0 0 1 0 1024z" fill="#E84335" p-id="4304" ></path> </svg> <p class="no_okText">{{_packageCode}} ã{{qiTaoReuslt}}ãï¼</p> </div> <div class="" v-show="isSuccess && isSuccess != 'æå'"> <svg t="1732842594517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4303" width="100" height="100"> @@ -52,7 +62,7 @@ p-id="4304" ></path> </svg> <p class="okText">{{ isSuccess }}</p> <p class="no_okText">{{ isSuccess }}</p> </div> </div> <ul> @@ -212,6 +222,8 @@ //=======================endé¼ æ å®ä½ ç¨äºå¼ç¨è¾å ¥æ¡===================== const isSuccess = ref(''); const qiTaoReuslt = ref(''); const _packageCode = ref(''); // æ¥è¯¢æä½ 888888888 const handleQuery = async () => { console.log('8888888è¿å ¥æ¹æ³', queryParams.value); @@ -221,6 +233,7 @@ console.log('æ¥è¯¢'); loading.value = true; var res = await ValdateQiTao(Object.assign(queryParams.value, tableParams.value)); _packageCode.value=queryParams.value.packageCode ; queryParams.value.packageCode = ''; handleResponse(res); @@ -230,14 +243,18 @@ materialCodeInput.value.$el.querySelector('input').value = ''; materialCodeInput.value.$el.querySelector('input').focus(); if (res.data.code == 200) { isSuccess.value = res.data.result ? 'æå' : res.data.message || 'æªæ¥è¯¢å°æ°æ®'; isSuccess.value = 'æå'; qiTaoReuslt.value = res.data.result ? res.data.result.qiTaoReuslt : ''; //qiTaoReuslt.value ='é½å¥';// 模æ } else if (res.data.code == 400) { loading.value = false; isSuccess.value = res.data.message || 'æªæ¥è¯¢å°æ°æ®'; qiTaoReuslt.value ='' ; return; } else { loading.value = false; isSuccess.value = ''; qiTaoReuslt.value ='' ; ElMessage.warning('ç½ç»å¼å¸¸ 请æ±å¤±è´¥'); return; } @@ -287,6 +304,12 @@ font-size: 36px; /* è°æ´åä½å¤§å° */ .okText { margin-bottom: 20px; color: #52C41A; /* 设置å¾æ é¢è² */ } .no_okText { margin-bottom: 20px; color: #E84335; /* 设置å¾æ é¢è² */ } } </style> LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Configuration/Database.json
@@ -21,12 +21,12 @@ // } //], "DbSettings": { "EnableInitDb": true, // å¯ç¨åºåå§å "EnableInitDb": false, // å¯ç¨åºåå§å "EnableDiffLog": false, // å¯ç¨åºè¡¨å·®å¼æ¥å¿ "EnableUnderLine": false // å¯ç¨é©¼å³°è½¬ä¸å线 }, "TableSettings": { "EnableInitTable": true, // å¯ç¨è¡¨åå§å "EnableInitTable": false, // å¯ç¨è¡¨åå§å "EnableIncreTable": false // å¯ç¨è¡¨å¢éæ´æ°-ç¹æ§[IncreTable] }, "SeedSettings": { LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs
@@ -114,7 +114,7 @@ { throw Oops.Oh($"没æé ç½® å¤æé½å¥ å¼"); } if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "æ ") if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value.Trim() != "æ ") { throw Oops.Oh($"å¤æé½å¥å¼å·²ç»åå¨å¼{sysConfig.Value},ä¸å 许æä½"); } @@ -138,10 +138,11 @@ _QiTaoReuslt = "é½å¥"; } //临æ¶å±è½ /* sysConfig.Value = setValue; await _sysConfigRep.UpdateAsync(sysConfig); //*/ var sysConfig_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper); SDA/iWareSda/Common/Struct/WareSdaStruct.cs
@@ -102,7 +102,8 @@ StationLocationEnum.BZ39.ToString(), StationLocationEnum.BZ21.ToString(), StationLocationEnum.BZ12.ToString(), StationLocationEnum.BZ30.ToString(), StationLocationEnum.BZ3007.ToString(), };
@@ -198,7 +198,7 @@ var view_stationObj = this.View.W_StationForWriteCommList.Where(x => x.StationCode == stationCode).FirstOrDefault(); MessageModel b2 = null; if (stationCode == StationLocationEnum.BZ01.ToString()) if (stationCode == StationLocationEnum.BZ01.ToString() || stationCode == StationLocationEnum.BZ30.ToString()) { int i_result = 0; if (value) SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -228,6 +228,15 @@ W_PackageWidth = W_DBHeaderWithSeparate_BZ21 + "4.0", }); _dbBlockForWrite.W_StationForWriteCommList.Add(new StationDBForWriteComm() { StationCode = StationLocationEnum.BZ30.ToString(), W_DataFinish = W_DBHeaderWithSeparate_BZ30 + "0.0", W_KittingInfo = W_DBHeaderWithSeparate_BZ30 + "2.0", }); return _dbBlockForWrite; } @@ -321,13 +330,7 @@ _dbBlockForRead.R_StationForReadCommList.Add(new StationDBForReadComm() { StationCode = StationLocationEnum.BZ30.ToString(), R_PalletizingAck = W_DBHeaderWithSeparate_BZ21 + "50.2", R_ReqParseData = W_DBHeaderWithSeparate_BZ21 + "50.0", R_SurrouondTaskFinish = W_DBHeaderWithSeparate_BZ21 + "50.1", R_SurrouondTaskNo = W_DBHeaderWithSeparate_BZ21 + "104.0", R_ReadCodeResult = W_DBHeaderWithSeparate_BZ21 + "52.0", R_PalletizingAck = W_DBHeaderWithSeparate_BZ30 + "50.0", }); return _dbBlockForRead;
