jcdm-main/pom.xml
@@ -77,6 +77,12 @@ <groupId>com.jcdm</groupId> <artifactId>jcdm-quartz</artifactId> </dependency> <dependency> <groupId>org.mybatis</groupId> <artifactId>mybatis</artifactId> <version>3.5.13</version> <scope>compile</scope> </dependency> </dependencies> </project> jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/IDaParamCollectionService.java
@@ -66,4 +66,7 @@ void addTighteningParameters(DaParamCollection daParamCollection); void saveCampaignTimeParameters(DaParamCollection daParamCollection); void saveBeachDaParamCollection(List<DaParamCollection> list); } jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -13,11 +13,16 @@ import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; import com.jcdm.main.da.passingStationCollection.mapper.DaPassingStationCollectionMapper; import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; import com.jcdm.main.plcserver.sub.OPCUaSubscription; import com.kangaroohy.milo.model.ReadWriteEntity; import com.kangaroohy.milo.service.MiloService; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; /** @@ -44,6 +49,9 @@ @Autowired private DaPassingStationCollectionMapper daPassingStationCollectionMapper; @Resource private SqlSessionFactory sqlSessionFactory; /** * 查询设备产品过程参数采集 * @@ -66,6 +74,27 @@ public List<DaParamCollection> selectDaParamCollectionList(DaParamCollection daParamCollection) { return daParamCollectionMapper.selectDaParamCollectionList(daParamCollection); } @Override public void saveBeachDaParamCollection(List<DaParamCollection> list) { // ExecutorType.SIMPLE: 这个执行器类型不做特殊的事情。它为每个语句的执行创建一个新的预处理语句。 // ExecutorType.REUSE: 这个执行器类型会复用预处理语句。 // ExecutorType.BATCH: 这个执行器会批量执行所有更新语句,如果 SELECT 在它们中间执行还会标定它们是 必须的,来保证一个简单并易于理解的行为。 // 关闭session的自动提交 SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); try { DaParamCollectionMapper userMapper = sqlSession.getMapper(DaParamCollectionMapper.class); list.stream().forEach(DaParamCollection -> userMapper.insertDaParamCollection(DaParamCollection)); // 提交数据 sqlSession.commit(); sqlSession.rollback(); } catch (Exception e) { sqlSession.rollback(); } finally { sqlSession.close(); } } /** @@ -197,6 +226,8 @@ daPassingStationCollections.get(0).setOutboundTime(new Date()); int i = daPassingStationCollectionMapper.updateDaPassingStationCollection(daPassingStationCollections.get(0)); OPCUaSubscription.SaveParamData(daParamCollection.getProductBarcode(),"OP",daParamCollection.getLocationCode(),daParamCollection.getWorkOrderNo(),daParamCollection.getProductCode()); //给opc发21 miloService.writeToOpcShort(ReadWriteEntity.builder().identifier("OP."+daParamCollection.getLocationCode()+".RecordDataDone").value(21).build()); } catch (Exception e) { jcdm-main/src/main/java/com/jcdm/main/em/inspectionPlanItemsProject/domain/EmInspectionPlanItemsProject.java
@@ -52,7 +52,7 @@ /** 任务ID */ private String planTaskId; private Long planTaskId; public void setId(Long id) { @@ -135,12 +135,12 @@ { return results; } public void setPlanTaskId(String planTaskId) public void setPlanTaskId(Long planTaskId) { this.planTaskId = planTaskId; } public String getPlanTaskId() public Long getPlanTaskId() { return planTaskId; } jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -24,7 +24,7 @@ public class OPCUaSubscription implements SubscriptionCallback { //自动工位 public List<String> automaticList = Arrays.asList("OP230","OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540"); public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540"); public static MiloService miloService; @@ -32,9 +32,9 @@ public IDaPassingStationCollectionService daPassingStationCollectionService; public IDaCollectionParamConfService collectionParamConfService; public static IDaCollectionParamConfService collectionParamConfService; public IDaParamCollectionService daParamCollectionService; public static IDaParamCollectionService daParamCollectionService; public OPCUaSubscription(MiloService miloService, IDaPassingStationCollectionService daPassingStationCollectionService, @@ -110,15 +110,6 @@ //保存拧紧数据 else if (("AngleResult").equals(tab)) { if("1".equals(tabVlaue)||"2".equals(tabVlaue)){ // String Torque = thoroughfare + "." + device + ".Torque"; // String Angle = thoroughfare + "." + device + ".Angle"; // String Result = thoroughfare + "." + device + ".Result"; // String Result1 = thoroughfare + "." + device + ".Result1"; // List<String> list = new ArrayList(); // list.add(Torque); // list.add(Angle); // list.add(Result); // list.add(Result1); List<String> list = new ArrayList<>(); String[] suffixes = {"Torque", "Angle", "Result", "Result1"}; @@ -167,7 +158,7 @@ //2、保存过站采集数据 saveStationInfo(PACKCodeParam,thoroughfare,device); //3、保存参数采集数据 SaveParamData(PACKCodeParam,thoroughfare,device); SaveParamData(PACKCodeParam,thoroughfare,device,"",""); result = "21"; @@ -198,7 +189,7 @@ daPassingStationCollectionService.insertDaPassingStationCollection(daPassingStationCollection); } public void SaveParamData(String packCode,String thoroughfare,String device) throws Exception { public static void SaveParamData(String packCode,String thoroughfare,String device,String workOrderNo,String productType) throws Exception { List<DaCollectionParamConf> list; DaCollectionParamConf daCollectionParamConf = new DaCollectionParamConf(); daCollectionParamConf.setGatherAddress(thoroughfare+ "." + device); @@ -227,10 +218,13 @@ //ParamCollection.setState("合格"); ParamCollection.setType(list.get(i).getCollectParameterType()); ParamCollection.setCollectionTime(new Date()); daParamCollectionService.insertDaParamCollection(ParamCollection); ParamCollection.setWorkOrderNo(workOrderNo); ParamCollection.setProductCode(productType); daParamCollectionlist.add(ParamCollection); // daParamCollectionService.insertDaParamCollection(ParamCollection); } } // daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist); daParamCollectionService.saveBeachDaParamCollection(daParamCollectionlist); } } jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -494,6 +494,7 @@ // this.formulaChildList = [] this.formulaChildParams.productCode = this.workpieceInformation.productCode this.formulaChildParams.processesCode = this.headContent.processesCode console.log(this.formulaChildParams) listFormulaChild(this.formulaChildParams).then(response => { this.formulaChildList = response.rows; }); @@ -601,6 +602,7 @@ productBarcode: self.headContent.sfcCode, } saveCampaignTimeParameters(param).then(response => {}); self.cakeLamp.release = 1; } else if (event.data.includes("[")) { let formulaChilds = "";
