| jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| jcdm-ui/src/views/main/da/psConf/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -18,6 +18,9 @@ public static final List<String> ModuleList = new ArrayList<>();//模组工位，用于校验是否传入模组码 public static final Map<String,String> materialMap = new HashMap();//人工工位 public static final Map<Integer,String> YEARSMAP = new HashMap();//年集合 public static final Map<Integer,String> MONTHSMAP = new HashMap();//月集合 public static final Map<Integer,String> DAYMAP = new HashMap();//日集合 public static final String NG = "2"; public static final String UN_PASS= "不合格"; jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -9,6 +9,7 @@ import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService; import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; import com.jcdm.main.da.psConf.service.IDaPsConfService; import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; import com.jcdm.main.plcserver.sub.OPCUaSubscription; @@ -49,7 +50,8 @@ @Autowired private IDaCellDataService daCellDataService; @Autowired private IDaPsConfService daPsConfService; @Override public void run(ApplicationArguments args) throws Exception { @@ -89,7 +91,8 @@ daParamCollectionService, omProductionOrdeInfoService, daTestDeviceInterfaceTempService, daCellDataService); daCellDataService, daPsConfService); List<String> lists = getSubList(); System.out.println("订阅内容："+lists); @@ -106,5 +109,77 @@ .stream().map(DaOpcuaConfig::getNode).collect(Collectors.toList()); return lists; } /** * 将日期放入MAP集合，1P1S用 */ public static void getDate(){ //年 Constants.YEARSMAP.put(2024,"E"); Constants.YEARSMAP.put(2025,"F"); Constants.YEARSMAP.put(2026,"G"); Constants.YEARSMAP.put(2027,"H"); Constants.YEARSMAP.put(2028,"J"); Constants.YEARSMAP.put(2029,"K"); Constants.YEARSMAP.put(2030,"L"); Constants.YEARSMAP.put(2031,"M"); Constants.YEARSMAP.put(2032,"N"); Constants.YEARSMAP.put(2033,"P"); Constants.YEARSMAP.put(2034,"R"); Constants.YEARSMAP.put(2035,"S"); Constants.YEARSMAP.put(2036,"T"); Constants.YEARSMAP.put(2037,"V"); Constants.YEARSMAP.put(2038,"W"); Constants.YEARSMAP.put(2039,"X"); Constants.YEARSMAP.put(2040,"Y"); //月 Constants.MONTHSMAP.put(1,"1"); Constants.MONTHSMAP.put(2,"2"); Constants.MONTHSMAP.put(3,"3"); Constants.MONTHSMAP.put(4,"4"); Constants.MONTHSMAP.put(5,"5"); Constants.MONTHSMAP.put(6,"6"); Constants.MONTHSMAP.put(7,"7"); Constants.MONTHSMAP.put(8,"8"); Constants.MONTHSMAP.put(9,"9"); Constants.MONTHSMAP.put(10,"A"); Constants.MONTHSMAP.put(11,"B"); Constants.MONTHSMAP.put(12,"C"); //日 Constants.DAYMAP.put(1,"1"); Constants.DAYMAP.put(2,"2"); Constants.DAYMAP.put(3,"3"); Constants.DAYMAP.put(4,"4"); Constants.DAYMAP.put(5,"5"); Constants.DAYMAP.put(6,"6"); Constants.DAYMAP.put(7,"7"); Constants.DAYMAP.put(8,"8"); Constants.DAYMAP.put(9,"9"); Constants.DAYMAP.put(10,"A"); Constants.DAYMAP.put(11,"B"); Constants.DAYMAP.put(12,"C"); Constants.DAYMAP.put(13,"D"); Constants.DAYMAP.put(14,"E"); Constants.DAYMAP.put(15,"F"); Constants.DAYMAP.put(16,"G"); Constants.DAYMAP.put(17,"H"); Constants.DAYMAP.put(18,"J"); Constants.DAYMAP.put(19,"K"); Constants.DAYMAP.put(20,"L"); Constants.DAYMAP.put(21,"M"); Constants.DAYMAP.put(22,"N"); Constants.DAYMAP.put(23,"P"); Constants.DAYMAP.put(24,"R"); Constants.DAYMAP.put(25,"S"); Constants.DAYMAP.put(26,"T"); Constants.DAYMAP.put(27,"V"); Constants.DAYMAP.put(28,"W"); Constants.DAYMAP.put(29,"X"); Constants.DAYMAP.put(30,"Y"); Constants.DAYMAP.put(31,"0"); } }
@@ -9,6 +9,7 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jcdm.common.core.domain.AjaxResult; import com.jcdm.framework.websocket.WebSocketUsers; import com.jcdm.main.constant.Constants; @@ -20,6 +21,8 @@ import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService; import com.jcdm.main.da.passingStationCollection.domain.DaPassingStationCollection; import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService; import com.jcdm.main.da.psConf.domain.DaPsConf; import com.jcdm.main.da.psConf.service.IDaPsConfService; import com.jcdm.main.da.testDeviceInterfaceTemp.domain.DaTestDeviceInterfaceTemp; import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; @@ -32,12 +35,14 @@ import com.kangaroohy.milo.runner.subscription.SubscriptionCallback; import com.kangaroohy.milo.service.MiloService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import javax.websocket.Session; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @@ -65,7 +70,7 @@ public static IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService; public static IDaCellDataService daCellDataService; public static IDaPsConfService daPsConfService; /* @Value("${orderLineUrl}") private static String orderLineUrl;*/ @@ -75,7 +80,8 @@ IDaParamCollectionService daParamCollectionService, IOmProductionOrdeInfoService omProductionOrdeInfoService, IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService, IDaCellDataService daCellDataService) { IDaCellDataService daCellDataService, IDaPsConfService daPsConfService) { OPCUaSubscription.miloService = miloService; OPCUaSubscription.daPassingStationCollectionService = daPassingStationCollectionService; OPCUaSubscription.collectionParamConfService = collectionParamConfService; @@ -83,6 +89,7 @@ OPCUaSubscription.omProductionOrdeInfoService = omProductionOrdeInfoService; OPCUaSubscription.daTestDeviceInterfaceTempService = daTestDeviceInterfaceTempService; OPCUaSubscription.daCellDataService = daCellDataService; OPCUaSubscription.daPsConfService = daPsConfService; } @@ -1070,6 +1077,11 @@ ); if (CollUtil.isNotEmpty(list)){ for(DaCollectionParamConf conf:list){ //1P1S生成 if(conf.getCollectParameterId().equals("1P1S")){ String result = get1P1S(sfcCode); conf.setParamCentral(result); } ChildVO childVO = new ChildVO(); childVO.setItemCode(conf.getCollectParameterId());//参数 childVO.setItemType(conf.getItemType()); @@ -1096,7 +1108,52 @@ throw new RuntimeException(e); } } /** * 生成1P1S码 * @param sfcCode * @return list */ public static String get1P1S(String sfcCode) { String result = ""; LocalDate now = LocalDate.now(); String supplierCode = sfcCode.substring(0,3); try { List<DaPsConf> list = daPsConfService.list(new LambdaQueryWrapper<DaPsConf>() .eq(DaPsConf::getSpareField1, supplierCode)//供应商识别码 .eq(DaPsConf::getState,"1"));//状态 if(!list.isEmpty()){ String mfCode = list.get(0).getMfCode();//厂商代码 String proTypeCode = list.get(0).getProTypeCode();//产品类型代码 String batteryTypeCode = list.get(0).getBatteryTypeCode();//电池类型代码 String specificationsCode = list.get(0).getSpecificationsCode();//规格代码 String traceInfoCode = list.get(0).getTraceInfoCode();//追溯信息代码 String proDateCode = Constants.YEARSMAP.get(now.getYear()) + Constants.MONTHSMAP.get(now.getMonthValue()) + Constants.DAYMAP.get(now.getDayOfMonth());//生产日期 String code = list.get(0).getSfcCode();//序列号 code = StringUtils.leftPad(String.valueOf(Integer.valueOf(code)+1),7, "0");;//序列号 result = mfCode+proTypeCode+batteryTypeCode+specificationsCode+traceInfoCode+proDateCode+code; log.info("读取到电芯码为：{},1P1S码为：{}",sfcCode,result); //更新日期和序列号 LambdaUpdateWrapper<DaPsConf> lambdaUpdateWrapper = new LambdaUpdateWrapper<DaPsConf>(); lambdaUpdateWrapper.set(DaPsConf::getProDateCode,proDateCode);//生产日期 lambdaUpdateWrapper.set(DaPsConf::getSfcCode,code);//序列号 lambdaUpdateWrapper.eq(DaPsConf::getSpareField1,supplierCode);//供应商识别码 lambdaUpdateWrapper.eq(DaPsConf::getState,"1");//状态 daPsConfService.update(lambdaUpdateWrapper); }else{ log.info("请先去1P1S配置页面配置规则!"); } return result; }catch (Exception e) { throw new RuntimeException(e); } } } jcdm-ui/src/views/main/da/psConf/index.vue
@@ -74,6 +74,10 @@ <el-table border v-loading="loading" :data="psConfList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="供应商识别码" align="center" prop="spareField1"> </el-table-column> <el-table-column label="供应商名称" align="center" prop="remarks"> </el-table-column> <el-table-column label="厂商代码" align="center" prop="mfCode"> </el-table-column> <el-table-column label="产品类型代码" align="center" prop="proTypeCode"> @@ -88,18 +92,15 @@ </el-table-column> <el-table-column label="序列号" align="center" prop="sfcCode"> </el-table-column> <el-table-column label="状态 (启用enable，禁用disable）" align="center" prop="state"> <el-table-column label="状态 (启用1，禁用0）" align="center" prop="state"> </el-table-column> <el-table-column label="备注" align="center" prop="remarks"> </el-table-column> <el-table-column label="预留字段1" align="center" prop="spareField1"> </el-table-column> <el-table-column label="预留字段2" align="center" prop="spareField2"> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser"> </el-table-column> <el-table-column label="更改用户" align="center" prop="updateUser"> </el-table-column> <!-- <el-table-column label="预留字段2" align="center" prop="spareField2"> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser"> </el-table-column> <el-table-column label="更改用户" align="center" prop="updateUser"> </el-table-column>--> <el-table-column fixed="right" width="200" label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope"> <el-button @@ -139,7 +140,13 @@ <i class="el-icon-s-order"></i> {{titleName}} </span> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form-item label="供应商识别码" prop="spareField1"> <el-input v-model="form.spareField1" placeholder="请输入供应商识别码" /> </el-form-item> <el-form-item label="供应商名称" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入供应商名称" /> </el-form-item> <el-form-item label="厂商代码" prop="mfCode"> <el-input v-model="form.mfCode" placeholder="请输入厂商代码" /> </el-form-item> @@ -155,30 +162,25 @@ <el-form-item label="追溯信息代码" prop="traceInfoCode"> <el-input v-model="form.traceInfoCode" placeholder="请输入追溯信息代码" /> </el-form-item> <el-form-item label="生产日期代码" prop="proDateCode"> <el-input v-model="form.proDateCode" placeholder="请输入生产日期代码" /> </el-form-item> <!-- <el-form-item label="生产日期代码" prop="proDateCode"> <el-input v-model="form.proDateCode" placeholder="请输入生产日期代码（不填）" /> </el-form-item>--> <el-form-item label="序列号" prop="sfcCode"> <el-input v-model="form.sfcCode" placeholder="请输入序列号" /> <el-input v-model="form.sfcCode" placeholder="请输入序列号"/> </el-form-item> <el-form-item label="状态 (启用enable，禁用disable）" prop="state"> <el-input v-model="form.state" placeholder="请输入状态 (启用enable，禁用disable）" /> <el-form-item label="状态" prop="state"> <el-input v-model="form.state" placeholder="请输入状态 (启用1，禁用0）" /> </el-form-item> <el-form-item label="备注" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入备注" /> </el-form-item> <el-form-item label="预留字段1" prop="spareField1"> <el-input v-model="form.spareField1" placeholder="请输入预留字段1" /> </el-form-item> <el-form-item label="预留字段2" prop="spareField2"> <el-input v-model="form.spareField2" placeholder="请输入预留字段2" /> </el-form-item> <el-form-item label="创建用户" prop="createUser"> <el-input v-model="form.createUser" placeholder="请输入创建用户" /> </el-form-item> <el-form-item label="更改用户" prop="updateUser"> <el-input v-model="form.updateUser" placeholder="请输入更改用户" /> </el-form-item> <!-- <el-form-item label="预留字段2" prop="spareField2"> <el-input v-model="form.spareField2" placeholder="请输入预留字段2" /> </el-form-item> <el-form-item label="创建用户" prop="createUser"> <el-input v-model="form.createUser" placeholder="请输入创建用户" /> </el-form-item> <el-form-item label="更改用户" prop="updateUser"> <el-input v-model="form.updateUser" placeholder="请输入更改用户" /> </el-form-item>--> </el-form> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitForm">确 定</el-button>
