接口添加工单号上传

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -325,15 +325,35 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}catch (Exception e){
 
 				}
+				String smt_line="";
+				if(LineName.equals("Line1")){
+					smt_line="贴片L1线";
+				}
+				if(LineName.equals("Line2")){
+					smt_line="贴片L2线";
+				}
+				if(LineName.equals("Line3")||LineName.equals("L3")){
+					smt_line="贴片L3线";
+				}
+				if(LineName.equals("Line4")||LineName.equals("L4")){
+					smt_line="贴片L4线";
+				}
+				if(LineName.equals("Line5")){
+					smt_line="贴片L5线";
+				}
+				if(LineName.equals("Line6")){
+					smt_line="贴片L6线";
+				}
+				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," +
+				baseDao.execute("insert into SETUPRESULTDETAIL(sr_id,ACTIONTYPE,LINENAME,SetupName,ORDERNUMBER,MACHINENAME," +
 						"TABLEID,DOCKINGSTATIONID,OPERATOR,TableLocation,FeederTypeName,FeederID,MessageSendTime)values('"+sr_id+"'," +
-						"'"+ActionType+"','"+LineName+"','"+OrderNumber+"','"+MachineName+"','"+TableId+"','"+DockingStationID+"'," +
+						"'"+ActionType+"','"+LineName+"','"+SetupName+"','"+OrderNumber+"','"+MachineName+"','"+TableId+"','"+DockingStationID+"'," +
 						"'"+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+"')");
+				baseDao.execute("insert into PACKAGINGUNIT(PU_ID,PUID,PU_SRID,ComponentBarcodeFragment,ComponentBarcode,OriginalQuantity,Quantity,CreateDate," +
+						"DateCode,BatchId,MsdLevel,makecode)values('"+pu_id+"','"+PUID+"','"+sr_id+"','"+ComponentBarcodeFragment+"','"+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++){