贴片机接口上传

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

@@ -275,7 +275,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			String ActionType=SetupResultDetail.get("ActionType").toString();
 			String LineName=SetupResultDetail.get("LineName").toString();
 			String MachineName=SetupResultDetail.get("MachineName").toString();
-			String ORDERNUMBER=SetupResultDetail.get("ORDERNUMBER").toString();
+			String OrderNumber=SetupResultDetail.get("OrderNumber").toString();
 			String DockingStationID=SetupResultDetail.get("DockingStationID").toString();
 			String Operator=SetupResultDetail.get("Operator").toString();
 			String TableLocation=SetupResultDetail.get("TableLocation").toString();
@@ -283,7 +283,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			String Track=SetupResultDetail.get("Track").toString();
 			String FeederTypeName=SetupResultDetail.get("FeederTypeName").toString();
 			String FeederID=SetupResultDetail.get("FeederID").toString();
-			JSONObject PackagingUnitDetail=SetupResultDetail.getJSONObject("PackagingUnitDetail");
+			JSONObject PackagingUnitDetail=SetupResultDetail.getJSONObject("PackagingUnit");
 			if(PackagingUnitDetail!=null){
 				String PUID=PackagingUnitDetail.getString("PUID");
 				String ComponentBarcode=PackagingUnitDetail.getString("ComponentBarcode");
@@ -291,38 +291,47 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String Quantity=PackagingUnitDetail.getString("Quantity");
 				String CreateDate=Time(PackagingUnitDetail.getString("CreateDate"));
 				String DateCode=PackagingUnitDetail.getString("DateCode");
-				String Batch2=PackagingUnitDetail.getString("Batch2");
+				String BatchId=PackagingUnitDetail.getString("BatchId");
 				String MsdLevel=PackagingUnitDetail.getString("MsdLevel");
-				String VerifiedDate=PackagingUnitDetail.getString("VerifiedDate");
-				JSONObject LockInfoList=PackagingUnitDetail.getJSONObject("LockInfoList");
-				JSONObject SplicedPackagingUnitList=PackagingUnitDetail.getJSONObject("SplicedPackagingUnitList");
+				JSONObject LockInfoList=null;
+				try{
+					LockInfoList=PackagingUnitDetail.getJSONObject("LockInfoList");
+				}catch (Exception e){
+
+				}
+				JSONObject SplicedPackagingUnitList=null;
+				try{
+					SplicedPackagingUnitList=PackagingUnitDetail.getJSONObject("SplicedPackagingUnitList");
+				}catch (Exception e){
+
+				}
 				int sr_id=baseDao.getSeqId("SETUPRESULTDETAIL_seq");
-				baseDao.execute("insert into SETUPRESULTDETAIL(pu_id,ACTIONTYPE,LINENAME,ORDERNUMBER,MACHINENAME," +
+				baseDao.execute("insert into SETUPRESULTDETAIL(sr_id,ACTIONTYPE,LINENAME,ORDERNUMBER,MACHINENAME," +
 						"TABLEID,DOCKINGSTATIONID,OPERATOR,TableLocation,FeederTypeName,FeederID)values('"+sr_id+"'," +
-						"'"+ActionType+"','"+LineName+"','"+ORDERNUMBER+"','"+MachineName+"','"+TableId+"','"+DockingStationID+"'," +
+						"'"+ActionType+"','"+LineName+"','"+OrderNumber+"','"+MachineName+"','"+TableId+"','"+DockingStationID+"'," +
 						"'"+Operator+"','"+TableLocation+"','"+FeederTypeName+"','"+FeederID+"')");
 				int pu_id=baseDao.getSeqId("PACKAGINGUNIT_seq");
 				baseDao.execute("insert into PACKAGINGUNIT(PU_ID,PU_SRID,ComponentBarcode,OriginalQuantity,Quantity,CreateDate," +
-						"DateCode,Batch2,MsdLevel)values('"+pu_id+"','"+sr_id+"','"+ComponentBarcode+"','"+OriginalQuantity+"','"+Quantity+"','to_char('"+CreateDate+"','yyyy-mm-dd hh24:mi:ss')" +
-						"'"+DateCode+"','"+Batch2+"','"+MsdLevel+"')");
+						"DateCode,BatchId,MsdLevel)values('"+pu_id+"','"+sr_id+"','"+ComponentBarcode+"','"+OriginalQuantity+"','"+Quantity+"',to_date('"+CreateDate+"','yyyy-mm-dd hh24:mi:ss')," +
+						"'"+DateCode+"','"+BatchId+"','"+MsdLevel+"')");
 				if(LockInfoList!=null){
 					JSONArray LockInfoItem=LockInfoList.getJSONArray("LockInfoItem");
-					for(int i=0;i<=LockInfoItem.size();i++){
+					for(int i=0;i<LockInfoItem.size();i++){
 						JSONObject map=LockInfoItem.getJSONObject(i);
-						String Date=map.getString("Date");
+						String Date=Time(map.getString("Date"));
 						String Message=map.getString("Message");
 						String Reason=map.getString("Reason");
 						String Source=map.getString("Source");
 						baseDao.execute("insert into LOCKINFOLIST(LF_ID,lf_puid,INDATE,MESSAGE,REASON,SOURCE)" +
-								"values(LOCKINFOLIST_seq.nextval,'"+pu_id+"','to_date('"+Date+"','yyyy-mm-dd hh24:mi:ss'),'"+Message+"'," +
+								"values(LOCKINFOLIST_seq.nextval,'"+pu_id+"',to_date('"+Date+"','yyyy-mm-dd hh24:mi:ss'),'"+Message+"'," +
 								"'"+Reason+"','"+Source+"')");
 					}
 				}
 				if(SplicedPackagingUnitList!=null){
-					JSONArray SplicedPackagingUnitItem=LockInfoList.getJSONArray("SplicedPackagingUnitItem");
-					for(int i=0;i<=SplicedPackagingUnitItem.size();i++){
+					JSONArray SplicedPackagingUnitItem=SplicedPackagingUnitList.getJSONArray("SplicedPackagingUnitItem");
+					for(int i=0;i<SplicedPackagingUnitItem.size();i++){
 						JSONObject map=SplicedPackagingUnitItem.getJSONObject(i);
-						String UID1=map.getString("UID");
+						String UID1=map.getString("PUID");
 						String ComponentBarcode1=map.getString("ComponentBarcode");
 						String ComponentBarcodeFragment=map.getString("ComponentBarcodeFragment");
 						String ComponentName=map.getString("ComponentName");
@@ -331,8 +340,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 						String ManufacturePartNumber=map.getString("ManufacturePartNumber");
 						String Manufacturer=map.getString("Manufacturer");
 						String Supplier=map.getString("Supplier");
-						baseDao.execute("insert into SPLICEDPACKAGING (SP_ID,SP_PUID,COMPONENTBARCODE,ORIGINALQUANTITY,QUANTITY)" +
-								"value(SPLICEDPACKAGING_seq.nextval,'"+pu_id+"','"+ComponentBarcode1+"','"+OriginalQuantity1+"','"+Quantity1+"')");
+						baseDao.execute("insert into SPLICEDPACKAGING (SP_ID,SP_PUID,PUID,COMPONENTBARCODE,ORIGINALQUANTITY,QUANTITY)" +
+								"values(SPLICEDPACKAGING_seq.nextval,'"+pu_id+"','"+UID1+"','"+ComponentBarcode1+"','"+OriginalQuantity1+"','"+Quantity1+"')");
 					}
 				}
 			}
@@ -364,17 +373,17 @@ public class MESHelperServiceImpl implements MESHelperService {
 			JSONObject MaterialConsumptionDetail=TraceabilityDataDetail.getJSONObject("MaterialConsumptionDetail");
 			//上料信息
 			if(MaterialTraceabilityDetail!=null){
-
 				JSONArray PanelList=MaterialTraceabilityDetail.getJSONArray("PanelList");
+				System.out.println(PanelList.size());
 				for (int i=0;i<PanelList.size();i++){
-
 					JSONObject map=PanelList.getJSONObject(i);
 					String PanelName=map.get("PanelName").toString();
 					JSONArray PackagingUnitRefList=map.getJSONArray("PackagingUnitRefList");
-					String PlaceRefID="";
+					System.out.println(PackagingUnitRefList.size());
 					if(PackagingUnitRefList!=null){
 						for (int j=0;j<PackagingUnitRefList.size();j++){
-							JSONObject map1=PackagingUnitRefList.getJSONObject(i);
+							String PlaceRefID="";
+							JSONObject map1=PackagingUnitRefList.getJSONObject(j);
 							String PUID=map1.getString("PUID");
 							String TableLocation=map1.getString("TableLocation");
 							String Track=map1.getString("Track");
@@ -390,7 +399,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 							JSONArray PlaceRefList=map1.getJSONArray("PlaceRefList");
 							if(PlaceRefList!=null){
 								for (int k=0;k<PlaceRefList.size();k++){
-									JSONObject map2=PlaceRefList.getJSONObject(i);
+									JSONObject map2=PlaceRefList.getJSONObject(k);
 									PlaceRefID+=map2.getString("PlaceRefID")+",";
 								}
 							}