|
@@ -158,11 +158,11 @@ public class DataUtil {
|
|
|
Properties pro = new Properties();
|
|
Properties pro = new Properties();
|
|
|
BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
|
|
BufferedReader br = new BufferedReader(new InputStreamReader(is, enconding));
|
|
|
pro.load(br);
|
|
pro.load(br);
|
|
|
- String gw = "GW"+rightPad(pro.getProperty("mes.gw"), 6);
|
|
|
|
|
|
|
+ String gw = "GW"+rightPad(MesClient.configParam.getOprno(), 6);
|
|
|
String start = "aaaabbbbbABW";
|
|
String start = "aaaabbbbbABW";
|
|
|
String gy = "GY" + rightPad(craft, 6);
|
|
String gy = "GY" + rightPad(craft, 6);
|
|
|
String reslx = "LX" + rightPad(lx, 2);
|
|
String reslx = "LX" + rightPad(lx, 2);
|
|
|
- String id = pro.getProperty("mes.line_sn") + rightPad(sn, 36);
|
|
|
|
|
|
|
+ String id = MesClient.configParam.getLineSn() + rightPad(sn, 36);
|
|
|
String rs = "RS"+ rightPad(result, 2);
|
|
String rs = "RS"+ rightPad(result, 2);
|
|
|
String da = "DA" + DateLocalUtils.getCurrentDate();
|
|
String da = "DA" + DateLocalUtils.getCurrentDate();
|
|
|
String zt = "ZT" + DateLocalUtils.getCurrentTimeHMS();
|
|
String zt = "ZT" + DateLocalUtils.getCurrentTimeHMS();
|