|
|
@@ -323,6 +323,26 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}catch (Exception e){
|
|
|
|
|
|
}
|
|
|
+ String smt_line="";
|
|
|
+ if(LineName.toUpperCase().equals("LINE1")){
|
|
|
+ smt_line="Line1";
|
|
|
+ }
|
|
|
+ if(LineName.toUpperCase().equals("LINE2")){
|
|
|
+ smt_line="Line2";
|
|
|
+ }
|
|
|
+ if(LineName.toUpperCase().equals("LINE3")||LineName.equals("L3")){
|
|
|
+ smt_line="Line3";
|
|
|
+ }
|
|
|
+ if(LineName.toUpperCase().equals("Line4")||LineName.equals("L4")){
|
|
|
+ smt_line="Line4";
|
|
|
+ }
|
|
|
+ if(LineName.toUpperCase().equals("LINE5")){
|
|
|
+ smt_line="Line5";
|
|
|
+ }
|
|
|
+ if(LineName.toUpperCase().equals("LINE6")){
|
|
|
+ smt_line="Line6";
|
|
|
+ }
|
|
|
+ Object makecode=baseDao.getFieldDataByCondition("Line","li_makecode","li_code='"+smt_line+"'");
|
|
|
int sr_id=baseDao.getSeqId("SETUPRESULTDETAIL_seq");
|
|
|
baseDao.execute("insert into SETUPRESULTDETAIL(sr_id,ACTIONTYPE,LINENAME,ORDERNUMBER,MACHINENAME," +
|
|
|
"TABLEID,DOCKINGSTATIONID,OPERATOR,TableLocation,FeederTypeName,FeederID,MessageSendTime)values('"+sr_id+"'," +
|
|
|
@@ -330,8 +350,8 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
"'"+Operator+"','"+TableLocation+"','"+FeederTypeName+"','"+FeederID+"',to_date('"+MessageSendTime+"','yyyy-mm-dd hh24:mi:ss'))");
|
|
|
int pu_id=baseDao.getSeqId("PACKAGINGUNIT_seq");
|
|
|
baseDao.execute("insert into PACKAGINGUNIT(PU_ID,PU_SRID,ComponentBarcode,OriginalQuantity,Quantity,CreateDate," +
|
|
|
- "DateCode,BatchId,MsdLevel)values('"+pu_id+"','"+sr_id+"','"+ComponentBarcode+"','"+OriginalQuantity+"','"+Quantity+"',to_date('"+CreateDate+"','yyyy-mm-dd hh24:mi:ss')," +
|
|
|
- "'"+DateCode+"','"+BatchId+"','"+MsdLevel+"')");
|
|
|
+ "DateCode,BatchId,MsdLevel,makecode)values('"+pu_id+"','"+sr_id+"','"+ComponentBarcode+"','"+OriginalQuantity+"','"+Quantity+"',to_date('"+CreateDate+"','yyyy-mm-dd hh24:mi:ss')," +
|
|
|
+ "'"+DateCode+"','"+BatchId+"','"+MsdLevel+"',makecode)");
|
|
|
if(LockInfoList!=null){
|
|
|
JSONArray LockInfoItem=LockInfoList.getJSONArray("LockInfoItem");
|
|
|
for(int i=0;i<LockInfoItem.size();i++){
|
