From b590f1374c4e48133a17c77bac8e9797811975ee Mon Sep 17 00:00:00 2001
From: 杨乐 <杨乐@DESKTOP-5CU1TNO>
Date: 星期二, 15 三月 2022 08:26:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/生产基础资料/Gy_Process.resx | 116 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 43 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
index fe1e873..e5d29aa 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.resx"
@@ -409,51 +409,81 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACE
- CgAAAk1TRnQBSQFMAgEBAgEAAXQBAQF0AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+ CgAAAk1TRnQBSQFMAgEBAgEAAXwBAQF8AQEBEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
AwABEAMAAQEBAAEgBgABEBIAgP+AAAj/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
AwAB/wMAAf8DAAH/AwAB/wMADf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
- AwAB/wMAAf8DAAH/gAAE/wEAATgBigH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQ
- AbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/AQMBkAG5Af8BAwGQAbkB/wEDAZABuQH/
- AQMBkAG5Af8DAAn/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AwAB/wMAAf+AAAT/
- AQABOAGKAf8B0QH2Av8BSgHaAfQB/wE/AdMB8QH/ATQBywHvAf8BKgHEAe0B/wEgAb4B6wH/ARYBuAHo
- Af8BCgGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQMBkAG5Af8DAAn/AQABOAGK
- Af8B0QH2Av8BHwG+AesB/wEZAbkB6QH/AREBtAHnAf8BCQGwAeYB/wECAasB5AH/AQABpwHjAf8BAAGi
- AeEB/wEAAZ8B4QH/AQMBkAG5Af8BAAE4AYoB/wMAAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AVAB3gH1
- Af8BRQHWAfMB/wE7AdAB8QH/ATAByQHuAf8BJgHCAewB/wEbAbwB6gH/AREBtAHnAf8BBgGtAeUB/wEA
- AaYB4wH/AQABoQHhAf8BAAGdAeAB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/ASoBxQHuAf8BJAHB
- AesB/wEdAbwB6wH/ARUBtwHoAf8BDgGyAecB/wEGAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
- AQMBkAG5Af8DAAH/AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYEB4QH3Af8BTAHaAfQB/wFB
- AdQB8gH/ATYBzAHvAf8BLAHGAe4B/wEiAcAB6wH/ARcBuQHpAf8BDQGyAeYB/wECAasB5QH/AQABpQHi
- Af8BAAGfAeEB/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AS8ByAHuAf8BKAHEAewB/wEhAb8B6wH/
- ARoBuwHqAf8BEwG2AegB/wELAbAB5wH/AQQBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABOAGKAf8DAAH/
- AQABOAGKAf8DAAH/gAAE/wEAATgBigH/AdEB9gL/AYYB5QH3Af8BUgHfAfUB/wFHAdgB8wH/AT0B0QHx
- Af8BMgHKAe8B/wEoAcQB7QH/AR4BvQHqAf8BEwG2AegB/wEIAa8B5QH/AQABqAHjAf8BAAGiAeEB/wED
- AZABuQH/AwAB/wEAATgBigH/AdEB9gL/ATsBzwHxAf8BNAHLAe8B/wEsAccB7gH/ASYBwgHsAf8BHwG9
- AeoB/wEXAbkB6QH/ARABtAHnAf8BCQGwAeYB/wEBAaoB5QH/AQMBkAG5Af8DAAH/AQMBkAG5Af8BAwGQ
- AbkB/wMAAf+AAAT/AQABOAGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU4B3AH1Af8BRAHVAfIB/wE4
- Ac4B8AH/AS4ByAHuAf8BJAHBAewB/wEaAboB6gH/AQ4BswHnAf8BBAGsAeUB/wEAAaYB4wH/AQMBkAG5
- Af8DAAH/AQABOAGKAf8B0QH2Av8BQAHTAfIB/wE4Ac4B8AH/ATEBygHuAf8BKgHFAe0B/wEkAcEB6wH/
- ARwBvAHqAf8BFQG3AegB/wENAbIB5gH/AQYBrgHlAf8BAwGQAbkB/wMAAf8BAwGQAbkB/wEDAZABuQH/
- AwAB/4AABP8BAAE4AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BVAHgAfYB/wFKAdkB8wH/AT8B0wHy
- Af8BNAHLAe8B/wEqAcUB7QH/ASABvgHrAf8BFgG4AekB/wEKAbAB5gH/AQABqQHkAf8BAwGQAbkB/wMA
- Af8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAwGQAbkB/wExAckB7gH/AQMBkAG5
- Af8DAAH/gAAE/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVEB3gH1Af8BRQHW
- AfMB/wE7Ac8B8QH/ATAByQHvAf8BJgHCAewB/wEcAbsB6QH/AREBtQHnAf8BBgGtAeYB/wEDAZABuQH/
- AwAF/wEAATgBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFR
- Ad0B9QH/AUsB2gHzAf8BRQHXAfMB/wFAAdMB8QH/AToBzwHxAf8BNAHLAe8B/wEDAZABuQH/AwAB/4AA
- BP8BAAE4AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
- AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wEDAZABuQH/AwAF/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkAHr
- AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFUAeAB9gH/AU8B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
- Av8B0QH2Av8BAwGQAbkB/wMAAf+AAAT/AQABOAGKAf8BFgGoAdMB/wEWAagB0wH/ARYBqAHTAf8BFgGo
- AdMB/wEWAagB0wH/ARYBqAHTAf8BFgGoAdMB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/
- AQABOAGKAf8BAAE4AYoJ/wEAATgBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
- Af8BhwHlAfcB/wHRAfYC/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4
- AYoF/4AACP8BAAE4AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATgBigH/AwAh/wEAATgBigH/
- AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABOAGKHf+AAAz/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBigH/AQABOAGKAf8BAAE4AYoB/wMAKf8BAAE4AYoB/wEAATgBigH/AQABOAGKAf8BAAE4AYoB/wEA
- ATgBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+ AwAB/wMAAf8DAAH/gAAE/wEAATcBigH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQ
+ AbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/AQIBkAG5Af8BAgGQAbkB/wECAZABuQH/
+ AQIBkAG5Af8DAAn/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AwAB/wMAAf+AAAT/
+ AQABNwGKAf8B0QH2Av8BSQHaAfQB/wE+AdMB8QH/ATMBywHvAf8BKQHEAe0B/wEfAb4B6wH/ARUBuAHo
+ Af8BCQGwAecB/wEAAakB5AH/AQABowHiAf8BAAGeAeAB/wEAAZoB3wH/AQIBkAG5Af8DAAn/AQABNwGK
+ Af8B0QH2Av8BHgG+AesB/wEYAbkB6QH/ARABtAHnAf8BCAGwAeYB/wEBAasB5AH/AQABpwHjAf8BAAGi
+ AeEB/wEAAZ8B4QH/AQIBkAG5Af8BAAE3AYoB/wMAAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AU8B3gH1
+ Af8BRAHWAfMB/wE6AdAB8QH/AS8ByQHuAf8BJQHCAewB/wEaAbwB6gH/ARABtAHnAf8BBQGtAeUB/wEA
+ AaYB4wH/AQABoQHhAf8BAAGdAeAB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/ASkBxQHuAf8BIwHB
+ AesB/wEcAbwB6wH/ARQBtwHoAf8BDQGyAecB/wEFAa4B5QH/AQABqQHkAf8BAAGlAeIB/wEAAaEB4QH/
+ AQIBkAG5Af8DAAH/AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYEB4QH3Af8BSwHaAfQB/wFA
+ AdQB8gH/ATUBzAHvAf8BKwHGAe4B/wEhAcAB6wH/ARYBuQHpAf8BDAGyAeYB/wEBAasB5QH/AQABpQHi
+ Af8BAAGfAeEB/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AS4ByAHuAf8BJwHEAewB/wEgAb8B6wH/
+ ARkBuwHqAf8BEgG2AegB/wEKAbAB5wH/AQMBrAHlAf8BAAGnAeMB/wEAAaMB4gH/AQABNwGKAf8DAAH/
+ AQABNwGKAf8DAAH/gAAE/wEAATcBigH/AdEB9gL/AYYB5QH3Af8BUQHfAfUB/wFGAdgB8wH/ATwB0QHx
+ Af8BMQHKAe8B/wEnAcQB7QH/AR0BvQHqAf8BEgG2AegB/wEHAa8B5QH/AQABqAHjAf8BAAGiAeEB/wEC
+ AZABuQH/AwAB/wEAATcBigH/AdEB9gL/AToBzwHxAf8BMwHLAe8B/wErAccB7gH/ASUBwgHsAf8BHgG9
+ AeoB/wEWAbkB6QH/AQ8BtAHnAf8BCAGwAeYB/wEAAaoB5QH/AQIBkAG5Af8DAAH/AQIBkAG5Af8BAgGQ
+ AbkB/wMAAf+AAAT/AQABNwGKAf8B0QH2Av8BjAHoAfkB/wGDAeIB9wH/AU0B3AH1Af8BQwHVAfIB/wE3
+ Ac4B8AH/AS0ByAHuAf8BIwHBAewB/wEZAboB6gH/AQ0BswHnAf8BAwGsAeUB/wEAAaYB4wH/AQIBkAG5
+ Af8DAAH/AQABNwGKAf8B0QH2Av8BPwHTAfIB/wE3Ac4B8AH/ATABygHuAf8BKQHFAe0B/wEjAcEB6wH/
+ ARsBvAHqAf8BFAG3AegB/wEMAbIB5gH/AQUBrgHlAf8BAgGQAbkB/wMAAf8BAgGQAbkB/wECAZABuQH/
+ AwAB/4AABP8BAAE3AYoB/wHRAfYC/wGQAesB+QH/AYgB5gH4Af8BUwHgAfYB/wFJAdkB8wH/AT4B0wHy
+ Af8BMwHLAe8B/wEpAcUB7QH/AR8BvgHrAf8BFQG4AekB/wEJAbAB5gH/AQABqQHkAf8BAgGQAbkB/wMA
+ Af8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAgGQAbkB/wEwAckB7gH/AQIBkAG5
+ Af8DAAH/gAAE/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BjQHpAfkB/wGFAeQB9wH/AVAB3gH1Af8BRAHW
+ AfMB/wE6Ac8B8QH/AS8ByQHvAf8BJQHCAewB/wEbAbsB6QH/ARABtQHnAf8BBQGtAeYB/wECAZABuQH/
+ AwAF/wEAATcBigH/AdEB9gL/AZEB7AH6Af8BjQHpAfkB/wGKAecB+AH/AYYB5AH4Af8BgQHhAfcB/wFQ
+ Ad0B9QH/AUoB2gHzAf8BRAHXAfMB/wE/AdMB8QH/ATkBzwHxAf8BMwHLAe8B/wECAZABuQH/AwAB/4AA
+ BP8BAAE3AYoB/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHRAfYC/wHR
+ AfYC/wHRAfYC/wHRAfYC/wHRAfYC/wECAZABuQH/AwAF/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkAHr
+ AfkB/wGMAekB+QH/AYgB5gH4Af8BhAHjAfcB/wFTAeAB9gH/AU4B3AH1Af8B0QH2Av8B0QH2Av8B0QH2
+ Av8B0QH2Av8BAgGQAbkB/wMAAf+AAAT/AQABNwGKAf8BFQGoAdMB/wEVAagB0wH/ARUBqAHTAf8BFQGo
+ AdMB/wEVAagB0wH/ARUBqAHTAf8BFQGoAdMB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/
+ AQABNwGKAf8BAAE3AYoJ/wEAATcBigH/AdEB9gL/AZMB7QH6Af8BkgHsAfoB/wGPAesB+QH/AYsB6AH4
+ Af8BhwHlAfcB/wHRAfYC/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3
+ AYoF/4AACP8BAAE3AYoB/wG4AegB9QH/Ac4D/wHOA/8BnAP/AZwD/wEAATcBigH/AwAh/wEAATcBigH/
+ AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AdEB9gL/AQABNwGKHf+AAAz/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBigH/AQABNwGKAf8BAAE3AYoB/wMAKf8BAAE3AYoB/wEAATcBigH/AQABNwGKAf8BAAE3AYoB/wEA
+ ATcBiiH/gACA/4AAgP+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/gQAL
+</value>
+ </data>
+ <data name="cmdHWWWasterWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
+</value>
+ </data>
+ <data name="cmdHWWBadWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ R0lGODlhEAAQAIYAAAAzmQBmzP///1o7AJlmAOazAMTz/9mmAEW5//nNT+W5ToPV/5TW/cyZAAyf/7Dp
+ /yOn/2jD/q3h/le8/sz3/5zg/7bt/73l/7Xs/2fH/4DT///bnZXb/97//2rK/wWb/8np/6zf/1S//77x
+ /73w/8Xv/1+//wmc/1jA/5Db/5LV/6rn/6Xb/zCt/33O/9X3/4LO/7jj/4PT/x+m/7nk/3XP/3PJ/3bQ
+ /6Tb/5Td/zCv/3fM/029/4za/6Pf/ZHc/6Pk/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+ AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEBAAAh+QQB
+ AABBACwAAAAAEAAQAAAIqACDCBwoMIDBAAQTBjEYIcKECQYVLmQQ44KJFhBmQECYMAAOEAJYnPjgwAHH
+ gQEYqAhBA4YOBDwQIDg5cYcLGyg8LOixYAFNABJkZBBRI8cDEg98ACAIlIOGGylWGOhgwMBSphUq/ACC
+ wQAFClcFEiAAQICAEhZGvDAbloCCDQUAlDUrQO5AtwkKHBgQRK7duwryHmjAV2IQAoIJGxY4QK/ixYwH
+ FIYcEAA7
</value>
</data>
<data name="cmdHBadCountDevelopWHID.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--
Gitblit v1.9.1