|
|
@@ -35,9 +35,11 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
|
|
|
String Master;
|
|
|
|
|
|
+ String accessKey1="";
|
|
|
@Override
|
|
|
public Map<Object,Object> DLLMain(String accessKey, String requestId, String data) {
|
|
|
String AE_MASTER = checkAccessKey(accessKey, requestId);
|
|
|
+ accessKey1=accessKey;
|
|
|
SpObserver.putSp(AE_MASTER);
|
|
|
//Master=SpObserver.getSp();
|
|
|
Master = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey + "'").toString();
|
|
|
@@ -1325,10 +1327,11 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
|
|
|
private Map<Object,Object> CS_SetFinish(String iMakeCode, String iSourceCode, String iSN, String iUserCode, String iResult)
|
|
|
{
|
|
|
+ Object AE_MASTER = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_MASTER", "AE_KEY='" + accessKey1 + "'");
|
|
|
Map<Object, Object> rmap = new HashMap<>();
|
|
|
String oErrMessage=null;
|
|
|
List<String> list = new ArrayList<String>();
|
|
|
- list = baseDao.callProcedureWithOut(Master+".CS_SETSTEPRESULT_TOOL", new Object[]{
|
|
|
+ list = baseDao.callProcedureWithOut(AE_MASTER+".CS_SETSTEPRESULT_TOOL", new Object[]{
|
|
|
String.valueOf(iMakeCode),
|
|
|
String.valueOf(iSourceCode),
|
|
|
String.valueOf(iSN),
|