From a089b55a19010405239251a9f3a036d8622797c7 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期五, 17 二月 2023 13:00:01 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/console.map.js | 52 ++++++++-------- src/main/resources/application.yml | 88 ++++++++++++++-------------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fbccc8c..813e5ed 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -35,7 +35,7 @@ enable: false wms: - url: localhost:8080/nbjfwms + url: localhost:8088/nbjfwms # 涓嬩綅鏈洪厤缃� wcs-slave: @@ -55,63 +55,63 @@ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 offset: 2 demo: false - # 鍫嗗灈鏈哄叆搴撶珯鐐�1 + # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笂 crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 102 + staNo: 106 row: 2 bay: 84 lev: 1 - # 鍫嗗灈鏈哄叆搴撶珯鐐�2 + # 鍫嗗灈鏈哄叆搴撶珯鐐�2 宸︿笂 crnInStn[1]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 112 + staNo: 116 row: 2 bay: 1 lev: 1 - # 鍫嗗灈鏈哄叆搴撶珯鐐�3 + # 鍫嗗灈鏈哄叆搴撶珯鐐�3 宸︿笂 2妤� crnInStn[2]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 202 + staNo: 205 row: 2 bay: 1 lev: 4 - # 鍫嗗灈鏈哄叆搴撶珯鐐� + # 鍫嗗灈鏈哄叆搴撶珯鐐� 宸︿笂 3妤� crnInStn[3]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 302 + staNo: 305 row: 2 bay: 1 lev: 7 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 鍙充笂 crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 102 + staNo: 106 row: 2 bay: 84 lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 宸︿笂 crnOutStn[1]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 112 + staNo: 116 row: 2 bay: 1 lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笂 2妤� crnOutStn[2]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 202 + staNo: 205 row: 2 bay: 1 lev: 4 - # 鍫嗗灈鏈哄嚭搴撶珯鐐� + # 鍫嗗灈鏈哄嚭搴撶珯鐐� 宸︿笂 3妤� crnOutStn[3]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 302 + staNo: 305 row: 2 bay: 1 lev: 7 - # 鍫嗗灈鏈�1 + # 鍫嗗灈鏈�2 crn[1]: id: 2 ip: 10.10.10.20 @@ -121,59 +121,59 @@ # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2 offset: 2 demo: false - # 鍫嗗灈鏈哄叆搴撶珯鐐�1 + # 鍫嗗灈鏈哄叆搴撶珯鐐�1 鍙充笅 crnInStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 106 + staNo: 102 row: 7 bay: 84 lev: 1 - # 鍫嗗灈鏈哄叆搴撶珯鐐�2 + # 鍫嗗灈鏈哄叆搴撶珯鐐�2 宸︿笅 crnInStn[1]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 116 + staNo: 112 row: 7 bay: 1 lev: 1 - # 鍫嗗灈鏈哄叆搴撶珯鐐�3 + # 鍫嗗灈鏈哄叆搴撶珯鐐�3 宸︿笅 2妤� crnInStn[2]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 205 + staNo: 202 row: 7 bay: 1 lev: 4 - # 鍫嗗灈鏈哄叆搴撶珯鐐�4 + # 鍫嗗灈鏈哄叆搴撶珯鐐�4 宸︿笅 3妤� crnInStn[3]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 305 + staNo: 302 row: 7 bay: 1 lev: 7 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�1 鍙充笅 crnOutStn[0]: devpPlcId: ${wcs-slave.devp[0].id} - staNo: 106 + staNo: 102 row: 7 bay: 84 lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�2 宸︿笅 crnOutStn[1]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 116 + staNo: 112 row: 7 - bay: 55 + bay: 1 lev: 1 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笅 2妤� crnOutStn[2]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 205 + staNo: 202 row: 7 bay: 1 lev: 4 - # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 + # 鍫嗗灈鏈哄嚭搴撶珯鐐�3 宸︿笅 3妤� crnOutStn[3]: devpPlcId: ${wcs-slave.devp[1].id} - staNo: 305 + staNo: 302 row: 7 bay: 1 lev: 7 @@ -186,33 +186,33 @@ slot: 0 # 鍏ュ簱鍙�1 inSta[0]: - staNo: 101 + staNo: 101 barcode: ${wcs-slave.barcode[0].id} barcode1: ${wcs-slave.barcode[8].id} barcode2: ${wcs-slave.barcode[9].id} # 鍏ュ簱鍙�2 inSta[1]: - staNo: 111 + staNo: 104 barcode: ${wcs-slave.barcode[1].id} # 绌烘澘鍏ュ簱鍙�1 emptyInSta[0]: staNo: 101 # 绌烘澘鍏ュ簱鍙�2 emptyInSta[1]: - staNo: 111 + staNo: 104 # 鍑哄簱鍙�1 outSta[0]: staNo: 100 # 鍑哄簱鍙�2 outSta[1]: - staNo: 110 + staNo: 103 # 鎷f枡鍏ュ簱鍙�1 pickSta[0]: staNo: 101 barcode: ${wcs-slave.barcode[0].id} # 鎷f枡鍏ュ簱鍙�2 pickSta[1]: - staNo: 111 + staNo: 104 barcode: ${wcs-slave.barcode[1].id} # 杈撻�佺嚎2 devp[1]: @@ -223,7 +223,7 @@ slot: 0 # 鍏ュ簱鍙�1 inSta[0]: - staNo: 104 + staNo: 111 barcode: ${wcs-slave.barcode[2].id} # 鍏ュ簱鍙�2 inSta[1]: @@ -247,7 +247,7 @@ barcode: ${wcs-slave.barcode[7].id} # 绌烘澘鍏ュ簱鍙�1 emptyInSta[0]: - staNo: 104 + staNo: 111 # 绌烘澘鍏ュ簱鍙�2 emptyInSta[1]: staNo: 114 @@ -265,7 +265,7 @@ staNo: 304 # 鍑哄簱鍙�1 outSta[0]: - staNo: 103 + staNo: 110 # 鍑哄簱鍙�2 outSta[1]: staNo: 113 @@ -283,7 +283,7 @@ staNo: 303 # 鎷f枡鍏ュ簱鍙�1 pickSta[0]: - staNo: 104 + staNo: 111 barcode: ${wcs-slave.barcode[2].id} # 鎷f枡鍏ュ簱鍙�2 pickSta[1]: diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js index 18b68b3..9e43f59 100644 --- a/src/main/webapp/static/js/console.map.js +++ b/src/main/webapp/static/js/console.map.js @@ -206,7 +206,7 @@ "type": "stn", "id": "site-102", "text": "102", - "top": 172, + "top": 359, "left": 1342, "width": 70, "height": 20 @@ -215,7 +215,7 @@ "type": "stn", "id": "site-101", "text": "101", - "top": 172, + "top": 359, "left": 1413, "width": 70, "height": 20 @@ -224,7 +224,7 @@ "type": "stn", "id": "site-100", "text": "100", - "top": 172, + "top": 359, "left": 1484, "width": 70, "height": 20 @@ -233,7 +233,7 @@ "type": "stn", "id": "site-106", "text": "106", - "top": 359, + "top": 172, "left": 1342, "width": 70, "height": 20 @@ -242,7 +242,7 @@ "type": "stn", "id": "site-105", "text": "105", - "top": 359, + "top": 172, "left": 1413, "width": 70, "height": 20 @@ -251,7 +251,7 @@ "type": "stn", "id": "site-104", "text": "104", - "top": 359, + "top": 172, "left": 1484, "width": 70, "height": 20 @@ -260,7 +260,7 @@ "type": "stn", "id": "site-103", "text": "103", - "top": 359, + "top": 172, "left": 1555, "width": 70, "height": 20 @@ -269,7 +269,7 @@ "type": "stn", "id": "site-112", "text": "112", - "top": 173, + "top": 358, "left": 403, "width": 70, "height": 20 @@ -278,7 +278,7 @@ "type": "stn", "id": "site-111", "text": "111", - "top": 173, + "top": 358, "left": 332, "width": 70, "height": 20 @@ -287,7 +287,7 @@ "type": "stn", "id": "site-110", "text": "110", - "top": 173, + "top": 358, "left": 261, "width": 70, "height": 20 @@ -296,7 +296,7 @@ "type": "stn", "id": "site-116", "text": "116", - "top": 358, + "top": 173, "left": 403, "width": 70, "height": 20 @@ -305,7 +305,7 @@ "type": "stn", "id": "site-115", "text": "115", - "top": 358, + "top": 173, "left": 332, "width": 70, "height": 20 @@ -314,7 +314,7 @@ "type": "stn", "id": "site-114", "text": "114", - "top": 358, + "top": 173, "left": 261, "width": 70, "height": 20 @@ -323,7 +323,7 @@ "type": "stn", "id": "site-113", "text": "113", - "top": 358, + "top": 173, "left": 190, "width": 70, "height": 20 @@ -343,7 +343,7 @@ "type": "stn", "id": "site-202", "text": "202", - "top": 173, + "top": 358, "left": 403, "width": 70, "height": 20 @@ -352,7 +352,7 @@ "type": "stn", "id": "site-201", "text": "201", - "top": 173, + "top": 358, "left": 332, "width": 70, "height": 20 @@ -361,7 +361,7 @@ "type": "stn", "id": "site-200", "text": "200", - "top": 173, + "top": 358, "left": 261, "width": 70, "height": 20 @@ -370,7 +370,7 @@ "type": "stn", "id": "site-205", "text": "205", - "top": 358, + "top": 173, "left": 403, "width": 70, "height": 20 @@ -379,7 +379,7 @@ "type": "stn", "id": "site-204", "text": "204", - "top": 358, + "top": 173, "left": 332, "width": 70, "height": 20 @@ -388,7 +388,7 @@ "type": "stn", "id": "site-203", "text": "203", - "top": 358, + "top": 173, "left": 261, "width": 70, "height": 20 @@ -408,7 +408,7 @@ "type": "stn", "id": "site-302", "text": "302", - "top": 173, + "top": 358, "left": 403, "width": 70, "height": 20 @@ -417,7 +417,7 @@ "type": "stn", "id": "site-301", "text": "301", - "top": 173, + "top": 358, "left": 332, "width": 70, "height": 20 @@ -426,7 +426,7 @@ "type": "stn", "id": "site-300", "text": "300", - "top": 173, + "top": 358, "left": 261, "width": 70, "height": 20 @@ -435,7 +435,7 @@ "type": "stn", "id": "site-305", "text": "305", - "top": 358, + "top": 173, "left": 403, "width": 70, "height": 20 @@ -444,7 +444,7 @@ "type": "stn", "id": "site-304", "text": "304", - "top": 358, + "top": 173, "left": 332, "width": 70, "height": 20 @@ -453,7 +453,7 @@ "type": "stn", "id": "site-303", "text": "303", - "top": 358, + "top": 173, "left": 261, "width": 70, "height": 20 -- Gitblit v1.9.1