jcdm-admin/src/main/resources/application-druid.yml
@@ -16,14 +16,14 @@ druid: # 主库数据源 master: url: jdbc:sqlserver://192.168.0.189:1433;DataBaseName=Jcdm035-Mes # url: jdbc:sqlserver://127.0.0.1:1433;DataBaseName=Jcdm035-Mes # url: jdbc:sqlserver://10.103.238.10:1433;DataBaseName=Jcdm035-Mes # url: jdbc:sqlserver://192.168.20.250:1433;DataBaseName=Jcdm035-Mes url: jdbc:sqlserver://192.168.20.250:1433;DataBaseName=Jcdm035-Mes username: sa password: JCDM@2023 # password: JCDM@2023 # password: admin@123 # password: 1!deshine # password: 123456 password: 123456 # 从库数据源 jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/controller/BsFormulaChildInfoController.java
@@ -65,6 +65,8 @@ miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(prefix+"RepairWorknum").value(bsFormulaChildInfo.getWorkOrderNo()).build()); miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(prefix+"Repairstation").value(bsFormulaChildInfo.getProcessesCode()).build()); miloService.writeToOpcUa(ReadWriteEntity.builder().identifier(prefix+"RepairLastar").value(bsFormulaChildInfo.getEngravingStatus()).build()); miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(prefix+"RepairFlag").value(1).build()); } catch (Exception e) { throw new RuntimeException(e); } jcdm-main/src/main/java/com/jcdm/main/bs/formulaChild/service/impl/BsFormulaChildInfoServiceImpl.java
@@ -375,6 +375,7 @@ BsFormulaChildInfo getMaterTwo = new BsFormulaChildInfo(); getMaterTwo.setProcessesCode(bsFormulaChildInfo.getLocationCode()); getMaterTwo.setOperationType("2"); getMaterTwo.setProductCode(bsFormulaChildInfo.getProductCode()); List<BsFormulaChildInfo> operationType = bsFormulaChildInfoMapper.selectBsFormulaChildInfoList(getMaterTwo); List<String> collect = operationType.stream().map(BsFormulaChildInfo::getResults).collect(Collectors.toList()); for (String s : collect) { jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/service/impl/DaParamCollectionServiceImpl.java
@@ -58,6 +58,8 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import static org.apache.commons.lang3.SystemUtils.getUserName; /** * 设备产品过程参数采集Service业务层处理 * @@ -406,6 +408,30 @@ } } public void addCollectParamBasicData(String stationCode,String modelCode){ List<DaCollectionParamConf> confList = daCollectionParamConfService.list(new LambdaQueryWrapper<DaCollectionParamConf>().like(DaCollectionParamConf::getCollectParameterId, "YGBH")); if(!confList.isEmpty()){ DaCollectionParamConf daCollectionParamConf = confList.get(0); DaParamCollection collection = new DaParamCollection(); collection.setSfcCode(modelCode);//模组码 collection.setParamCode(daCollectionParamConf.getCollectParameterId());//参数编码 collection.setParamName(daCollectionParamConf.getCollectParameterName());//参数名称 collection.setParamValue(getUserName());//参数值 collection.setLocationCode(stationCode);//工位 collection.setCollectionTime(new Date());//采集时间 daParamCollectionService.save(collection); DaParamCollectionTemp collectionTemp = new DaParamCollectionTemp(); collectionTemp.setSfcCode(modelCode);//模组码 collectionTemp.setParamCode(daCollectionParamConf.getCollectParameterId());//参数编码 collectionTemp.setParamName(daCollectionParamConf.getCollectParameterName());//参数名称 collectionTemp.setParamValue(getUserName());//参数值 collectionTemp.setLocationCode(stationCode);//工位 collectionTemp.setCollectionTime(new Date());//采集时间 daParamCollectionTempService.save(collectionTemp); } } @Override public void pushStartStopTime(String paramCode, String paramName, String productNum) { ParentVO parentVO = new ParentVO(); @@ -574,6 +600,12 @@ @Override public void pushGeelycvMesFeedback(String packID, String stationCode) { //添加基础参数(登陆人信息) try { addCollectParamBasicData(stationCode,packID); }catch (Exception e){ throw new RuntimeException(e); } logger.info("进入人工工位推送工厂MES数据方法-pushGeelycvMesFeedback-工位{}-pack码{}",stationCode,packID); SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String totalResult = "0"; jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/service/impl/OmProductionOrdeInfoServiceImpl.java
@@ -74,9 +74,12 @@ @Override public int insertOmProductionOrdeInfo(OmProductionOrdeInfo omProductionOrdeInfo) { omProductionOrdeInfo.setCreateTime(DateUtils.getNowDate()); Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber(); omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1)); // omProductionOrdeInfo.setCreateTime(DateUtils.getNowDate()); // Integer streamNumber = omProductionOrdeInfoMapper.getMaxStreamNumber(); // omProductionOrdeInfo.setStreamNumber(String.valueOf(streamNumber+1)); omProductionOrdeInfo.setCreateTime(new Date()); omProductionOrdeInfo.setOnlineCompletionMark("0"); omProductionOrdeInfo.setSfResult("0"); return omProductionOrdeInfoMapper.insertOmProductionOrdeInfo(omProductionOrdeInfo); }
@@ -108,6 +108,7 @@ <if test="whetherToCollect != null">whether_to_collect,</if> <if test="defaultValue != null">default_value,</if> <if test="productModel != null">product_model,</if> <if test="itemType != null">item_type,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> @@ -146,6 +147,7 @@ <if test="whetherToCollect != null">#{whetherToCollect},</if> <if test="defaultValue != null">#{defaultValue},</if> <if test="productModel != null">#{productModel},</if> <if test="itemType != null">#{itemType},</if> </trim> </insert> @@ -187,6 +189,7 @@ <if test="whetherToCollect != null">whether_to_collect = #{whetherToCollect},</if> <if test="defaultValue != null">default_value = #{defaultValue},</if> <if test="productModel != null">product_model = #{productModel},</if> <if test="itemType != null">item_type = #{itemType},</if> </trim> where id = #{id} jcdm-ui/src/views/main/bs/workshop/index.vue
@@ -30,6 +30,8 @@ <div id="printMe"> <div ref="canvasWrapper" id="canvasWrapper"></div> <p>P9900166410#T2342325325235235#V993983#SSW002.005#HHW001.001#NMCU#</p> <p style="margin-top: 41px">P9900166410#T2342325325235235#V993983#SSW002.005#HHW001.001#NMCU#</p> </div> <VueQr :size='80' :margin='0' :text='this.text'></VueQr> <el-button @click="print">打印</el-button> jcdm-ui/src/views/main/cfkb/labelReplacement/index.vue
@@ -220,7 +220,7 @@ </div> </div> <div style="text-align: center;margin-left: -190px;margin-top: 31px"> <div style="text-align: center;margin-left: -190px;margin-top: 41px"> <div style="margin-top: 4px"> <span>{{printMaterialCode}}</span><br> </div> @@ -701,7 +701,7 @@ if(self.headContent.processesCode === "OP165"){ // self.test1() // self.test2() self.text = 'P9900200461#T'+self.headContent.sfcCode+'#V993983#SSW002.005#HHW001.001#NMCU#' self.text = 'P9900200461#T'+self.headContent.sfcCode+'#V993983#SSW001.001#HHW001.001#NMCU#' } }else if (event.data.includes("[")) {//拧紧 jcdm-ui/src/views/main/da/collectionParamConf/index.vue
@@ -125,22 +125,19 @@ <el-table border v-loading="loading" :data="collectionParamConfList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <!-- <el-table-column label="主键id" align="center" prop="id" />--> <el-table-column label="产品编码" align="center" width="150" prop="productCode"> </el-table-column> <el-table-column label="产品型号" align="center" prop="productModel"> </el-table-column> <!-- <el-table-column label="产品编码" align="center" width="150" prop="productCode">--> <!-- </el-table-column>--> <!-- <el-table-column label="产品型号" align="center" prop="productModel">--> <!-- </el-table-column>--> <el-table-column label="工序编号" align="center" width="80" prop="processesCode"> </el-table-column> <el-table-column label="工序名称" width="150" align="center" prop="processesName"> </el-table-column> <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress"> </el-table-column> <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence"> </el-table-column> <el-table-column label="设备" width="150" align="center" prop="device"> </el-table-column> <el-table-column label="项目" align="center" prop="project"> </el-table-column> <!-- <el-table-column label="工序名称" width="150" align="center" prop="processesName">--> <!-- </el-table-column>--> <!-- <el-table-column label="设备" width="150" align="center" prop="device">--> <!-- </el-table-column>--> <!-- <el-table-column label="项目" align="center" prop="project">--> <!-- </el-table-column>--> <!-- <el-table-column label="参数集编码" align="center" width="130" prop="parameterSetCode">--> <!-- </el-table-column>--> <!-- <el-table-column label="参数集名称" align="center" width="160" prop="parameterSetName">--> @@ -149,16 +146,20 @@ </el-table-column> <el-table-column label="参数名称" align="center" width="200" prop="collectParameterName"> </el-table-column> <el-table-column label="采集地址" align="center" width="180" prop="gatherAddress"> </el-table-column> <el-table-column label="采集顺序" align="center" width="80" prop="gatherSequence"> </el-table-column> <!-- <el-table-column label="是否作为对比参数" align="center" prop="contrastParameterFlag">--> <!-- </el-table-column>--> <el-table-column label="参数类型" align="center" width="130" prop="collectParameterType"> </el-table-column> <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit"> </el-table-column> <el-table-column label="精度" align="center" prop="accuracy"> </el-table-column> <el-table-column label="数组长度" align="center" prop="arrayLength"> </el-table-column> <!-- <el-table-column label="单位" align="center" width="80" prop="collectParameterUnit">--> <!-- </el-table-column>--> <!-- <el-table-column label="精度" align="center" prop="accuracy">--> <!-- </el-table-column>--> <!-- <el-table-column label="数组长度" align="center" prop="arrayLength">--> <!-- </el-table-column>--> <!-- <el-table-column label="数据描述" align="center" width="160" prop="Descriptives"> </el-table-column>--> <el-table-column label="上限值" align="center" prop="paramUpper"> @@ -167,22 +168,24 @@ </el-table-column> <el-table-column label="中心值" align="center" prop="paramCentral"> </el-table-column> <el-table-column label="采集频率" width="107" align="center" prop="acquisitionFrequency"> </el-table-column> <el-table-column label="业务需求部门" width="155" align="center" prop="demandDepartment"> </el-table-column> <!-- <el-table-column label="采集频率" width="107" align="center" prop="acquisitionFrequency">--> <!-- </el-table-column>--> <!-- <el-table-column label="业务需求部门" width="155" align="center" prop="demandDepartment">--> <!-- </el-table-column>--> <el-table-column label="是否采集" align="center" prop="whetherToCollect"> </el-table-column> <el-table-column label="备注" :show-overflow-tooltip='true' align="center" width="160" prop="remarks"> <el-table-column label="工厂数据类型" align="center" prop="itemType"> </el-table-column> <el-table-column label="创建用户" align="center" prop="createUser"> </el-table-column> <el-table-column label="创建时间" align="center" width="160" prop="createTime"> </el-table-column> <el-table-column label="更改用户" align="center" prop="updateUser"> </el-table-column> <el-table-column label="更改时间" align="center" width="160" prop="updateTime"> </el-table-column> <!-- <el-table-column label="备注" :show-overflow-tooltip='true' align="center" width="160" prop="remarks">--> <!-- </el-table-column>--> <!-- <el-table-column label="创建用户" align="center" prop="createUser">--> <!-- </el-table-column>--> <!-- <el-table-column label="创建时间" align="center" width="160" prop="createTime">--> <!-- </el-table-column>--> <!-- <el-table-column label="更改用户" align="center" prop="updateUser">--> <!-- </el-table-column>--> <!-- <el-table-column label="更改时间" align="center" width="160" prop="updateTime">--> <!-- </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 @@ -238,6 +241,9 @@ <el-form-item label="采集参数名称" prop="collectParameterName"> <el-input v-model="form.collectParameterName" placeholder="请输入采集参数名称" /> </el-form-item> <el-form-item label="采集参数类型" prop="collectParameterType"> <el-input v-model="form.collectParameterType" placeholder="请输入采集参数名称" /> </el-form-item> <!-- <el-form-item label="采集参数类型" prop="collectParameterType">--> <!-- <el-select v-model="form.collectParameterType" placeholder="请选择采集参数类型">--> <!-- <el-option--> @@ -248,12 +254,12 @@ <!-- ></el-option>--> <!-- </el-select>--> <!-- </el-form-item>--> <el-form-item label="采集参数单位" prop="collectParameterUnit"> <el-input v-model="form.collectParameterUnit" placeholder="请输入采集参数单位" /> </el-form-item> <el-form-item label="数据描述" prop="descriptives"> <el-input v-model="form.descriptives" placeholder="请输入数据描述" /> </el-form-item> <!-- <el-form-item label="采集参数单位" prop="collectParameterUnit">--> <!-- <el-input v-model="form.collectParameterUnit" placeholder="请输入采集参数单位" />--> <!-- </el-form-item>--> <!-- <el-form-item label="数据描述" prop="descriptives">--> <!-- <el-input v-model="form.descriptives" placeholder="请输入数据描述" />--> <!-- </el-form-item>--> <el-form-item label="上限值" prop="paramUpper"> <el-input v-model="form.paramUpper" placeholder="请输入上限值" /> </el-form-item> @@ -263,41 +269,41 @@ <el-form-item label="中心值" prop="paramCentral"> <el-input v-model="form.paramCentral" placeholder="请输入中心值" /> </el-form-item> <el-form-item label="产品编码" prop="productCode"> <el-input v-model="form.productCode" placeholder="请输入产品编码" /> </el-form-item> <!-- <el-form-item label="产品编码" prop="productCode">--> <!-- <el-input v-model="form.productCode" placeholder="请输入产品编码" />--> <!-- </el-form-item>--> <el-form-item label="采集地址" prop="gatherAddress"> <el-input v-model="form.gatherAddress" placeholder="请输入采集地址" /> </el-form-item> <el-form-item label="采集顺序" prop="gatherSequence"> <el-input v-model="form.gatherSequence" placeholder="请输入采集顺序" /> </el-form-item> <el-form-item label="工序名称" prop="processesName"> <el-input v-model="form.processesName" placeholder="请输入工序名称" /> </el-form-item> <el-form-item label="设备" prop="device"> <el-input v-model="form.device" placeholder="请输入设备" /> </el-form-item> <el-form-item label="项目" prop="project"> <el-input v-model="form.project" placeholder="请输入项目" /> </el-form-item> <el-form-item label="精度" prop="accuracy"> <el-input v-model="form.accuracy" placeholder="请输入精度" /> </el-form-item> <el-form-item label="数组长度" prop="arrayLength"> <el-input v-model="form.arrayLength" placeholder="请输入数组长度" /> </el-form-item> <el-form-item label="采集频率" prop="acquisitionFrequency"> <el-input v-model="form.acquisitionFrequency" placeholder="请输入采集频率" /> </el-form-item> <el-form-item label="业务需求部门" prop="demandDepartment"> <el-input v-model="form.demandDepartment" placeholder="请输入业务需求部门" /> </el-form-item> <!-- <el-form-item label="工序名称" prop="processesName">--> <!-- <el-input v-model="form.processesName" placeholder="请输入工序名称" />--> <!-- </el-form-item>--> <!-- <el-form-item label="设备" prop="device">--> <!-- <el-input v-model="form.device" placeholder="请输入设备" />--> <!-- </el-form-item>--> <!-- <el-form-item label="项目" prop="project">--> <!-- <el-input v-model="form.project" placeholder="请输入项目" />--> <!-- </el-form-item>--> <!-- <el-form-item label="精度" prop="accuracy">--> <!-- <el-input v-model="form.accuracy" placeholder="请输入精度" />--> <!-- </el-form-item>--> <!-- <el-form-item label="数组长度" prop="arrayLength">--> <!-- <el-input v-model="form.arrayLength" placeholder="请输入数组长度" />--> <!-- </el-form-item>--> <!-- <el-form-item label="采集频率" prop="acquisitionFrequency">--> <!-- <el-input v-model="form.acquisitionFrequency" placeholder="请输入采集频率" />--> <!-- </el-form-item>--> <!-- <el-form-item label="业务需求部门" prop="demandDepartment">--> <!-- <el-input v-model="form.demandDepartment" placeholder="请输入业务需求部门" />--> <!-- </el-form-item>--> <el-form-item label="是否采集" prop="whetherToCollect"> <el-input v-model="form.whetherToCollect" placeholder="请输入是否采集" /> </el-form-item> <el-form-item label="默认值" prop="defaultValue"> <el-input v-model="form.defaultValue" placeholder="请输入默认值" /> <el-form-item label="工厂数据类型" prop="itemType"> <el-input v-model="form.itemType" placeholder="请输入工厂数据类型" /> </el-form-item> <el-form-item label="备注" prop="remarks"> <el-input v-model="form.remarks" placeholder="请输入备注" /> @@ -415,7 +421,8 @@ demandDepartment: null, whetherToCollect: null, defaultValue: null, productModel: null productModel: null, itemType: null, }; this.resetForm("form"); jcdm-ui/src/views/main/kb/preInstalledTerminal/index.vue
@@ -1,19 +1,32 @@ <template> <div class="app-container"> <el-row :gutter="5"> <el-col :span="7"> <el-col :span="4"> <el-card style="height: 72px;padding-top: 9px" shadow="never"> <span class="head-font">工位编号 : {{headContent.processesCode}}</span> <span hidden>{{headContent.inboundTime}}</span> </el-card> </el-col> <el-col :span="7"> <el-col :span="6"> <el-card shadow="never"> <span class="head-font">物料编码 : </span> <el-input style="width: 70%" ref="inputData" v-model="materialCode" @change="materialCodeHandleEnter" placeholder="请扫描总成序列号"></el-input> </el-card> </el-col> <el-col :span="10"> <el-col :span="6"> <el-card shadow="never"> <span class="head-font">产品型号 : </span> <el-select style="width: 70%" v-model="selectProductCode" placeholder="请选择"> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </el-option> </el-select> </el-card> </el-col> <el-col :span="8"> <el-card style="height: 72px;padding-top: 9px" shadow="never"> <span class="head-font">产品序列号 : {{headContent.sfcCode}}</span> <el-button @click="clearClick" style="float: right" type="danger" size="mini">清除</el-button> @@ -73,6 +86,14 @@ name: "stationTerminal", data() { return { selectProductCode: '9900200461', options: [{ value: '9900200461', label: '9900200461' }, { value: '9900207783', label: '9900207783' }], showInput: true, serialPortContent: '', // 查询参数 @@ -122,7 +143,7 @@ }, content: '', activeName: 'first', // url: "ws://10.103.210.248:8080/websocket/message/", // url: "ws://192.168.10.231:8080/websocket/message/", url: "ws://192.168.20.250:8080/websocket/message/", message: "", text_content: "", @@ -212,7 +233,7 @@ scanBarcode: value, sfcBarcode: this.headContent.sfcCode, workOrderNo: '-', productCode: "9900200461", productCode: this.selectProductCode, locationCode: this.headContent.processesCode, collectionTime: new Date() } @@ -230,7 +251,7 @@ }, /** 查询配方配置子信息列表 */ getListFormulaChild() { this.formulaChildParams.productCode = "9900200461" this.formulaChildParams.productCode = this.selectProductCode this.formulaChildParams.processesCode = this.headContent.processesCode console.log(this.formulaChildParams) noPageListFormulaChild(this.formulaChildParams).then(response => { @@ -252,7 +273,8 @@ } }) } }else { this.$message.error("无配方加载请检查！！"); } }); }, @@ -354,6 +376,8 @@ }; this.ws.onmessage = function (event) { if(event.data.includes("[")) { console.log(self.selectProductCode) let formulaChilds = ""; self.formulaChildList.sort((a, b) => a.stepSort - b.stepSort); self.formulaChildList @@ -370,7 +394,7 @@ tightenTheArray: event.data, paramCode: formulaChilds.paramCode, workOrderNo: '-', productCode: "9900200461", productCode: self.selectProductCode, locationCode: self.headContent.processesCode, productBarcode: self.headContent.sfcCode, spareField2: formulaChilds.spareField2, jcdm-ui/src/views/main/kb/repairOnline/index.vue
@@ -16,8 +16,8 @@ </el-col> <el-col :span="17"> <el-card shadow="never"> <span class="head-font">壳体编码 : </span> <el-input style="width: 40%" ref="inputData" v-model="shellBarcode" @change="handleEnter" placeholder="请扫描壳体编码"></el-input> <span class="head-font">产品序列号 : </span> <el-input style="width: 40%" ref="inputData" v-model="shellBarcode" @change="handleEnter" placeholder="请扫描产品序列号"></el-input> 是否打刻 : <el-select v-model="engravingStatus" placeholder="请选择"> <el-option @@ -290,7 +290,7 @@ }, handleEnter() { if(this.headContent.processesCode !== '' && this.engravingStatus !== ''){ this.queryParams.trolleyYard = this.shellBarcode this.queryParams.productNum = this.shellBarcode listProductionOrde(this.queryParams).then(response => { let rowsData = response.rows[0]; if(rowsData){ jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -259,7 +259,7 @@ </div> </div> <div style="text-align: center;margin-left: -190px;margin-top: 37px"> <div style="text-align: center;margin-left: -190px;margin-top: 41px"> <div style="margin-top: 4px"> <span>{{printMaterialCode}}</span><br> </div> jcdm-ui/src/views/main/om/productionOrde/index.vue
@@ -2,14 +2,14 @@ <div class="app-container"> <el-card class="box-card"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form-item label-width="80" label="生产工单号" prop="workOrderNo"> <el-input v-model="queryParams.workOrderNo" placeholder="请输入生产工单号" clearable @keyup.enter.native="handleQuery" /> </el-form-item> <!-- <el-form-item label-width="80" label="生产工单号" prop="workOrderNo">--> <!-- <el-input--> <!-- v-model="queryParams.workOrderNo"--> <!-- placeholder="请输入生产工单号"--> <!-- clearable--> <!-- @keyup.enter.native="handleQuery"--> <!-- />--> <!-- </el-form-item>--> <el-form-item label="产品编码" prop="productCode"> <el-input v-model="queryParams.productCode" @@ -18,42 +18,42 @@ @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label-width="80" label="PACK码" prop="productNum"> <el-form-item label-width="100" label="产品序列号" prop="productNum"> <el-input v-model="queryParams.productNum" placeholder="请输入PACK码" placeholder="请输入产品序列号码" clearable @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label="小车码" prop="trolleyYard"> <el-form-item label="壳体条码" prop="trolleyYard"> <el-input v-model="queryParams.trolleyYard" placeholder="请输入小车码" placeholder="请输入壳体条码" clearable @keyup.enter.native="handleQuery" /> </el-form-item> <el-form-item label-width="1" label="上线报工状态" prop="onlineCompletionMark"> <el-select v-model="queryParams.onlineCompletionMark" placeholder="请选择上线报工状态" clearable> <el-option v-for="dict in dict.type.work_reporting_status" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label-width="1" label="下线报工状态" prop="sfResult"> <el-select v-model="queryParams.sfResult" placeholder="请选择下线报工状态" clearable> <el-option v-for="dict in dict.type.work_reporting_status" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <!-- <el-form-item label-width="1" label="上线报工状态" prop="onlineCompletionMark">--> <!-- <el-select v-model="queryParams.onlineCompletionMark" placeholder="请选择上线报工状态" clearable>--> <!-- <el-option--> <!-- v-for="dict in dict.type.work_reporting_status"--> <!-- :key="dict.value"--> <!-- :label="dict.label"--> <!-- :value="dict.value"--> <!-- />--> <!-- </el-select>--> <!-- </el-form-item>--> <!-- <el-form-item label-width="1" label="下线报工状态" prop="sfResult">--> <!-- <el-select v-model="queryParams.sfResult" placeholder="请选择下线报工状态" clearable>--> <!-- <el-option--> <!-- v-for="dict in dict.type.work_reporting_status"--> <!-- :key="dict.value"--> <!-- :label="dict.label"--> <!-- :value="dict.value"--> <!-- />--> <!-- </el-select>--> <!-- </el-form-item>--> <div style="display: none"> <div id="printMe" style="width: 500px;"> @@ -107,37 +107,37 @@ <el-card style="margin-top: 10px" class="box-card"> <el-row :gutter="10" class="mb8"> <!-- <el-col :span="1.5">--> <!-- <el-button--> <!-- type="primary"--> <!-- plain--> <!-- icon="el-icon-plus"--> <!-- size="mini"--> <!-- @click="handleAdd"--> <!-- v-hasPermi="['om:productionOrde:add']"--> <!-- >新增</el-button>--> <!-- </el-col>--> <!-- <el-col :span="1.5">--> <!-- <el-button--> <!-- type="success"--> <!-- plain--> <!-- icon="el-icon-edit"--> <!-- size="mini"--> <!-- :disabled="single"--> <!-- @click="handleUpdate"--> <!-- v-hasPermi="['om:productionOrde:edit']"--> <!-- >修改</el-button>--> <!-- </el-col>--> <!-- <el-col :span="1.5">--> <!--<!– <el-button–>--> <!--<!– type="danger"–>--> <!--<!– plain–>--> <!--<!– icon="el-icon-delete"–>--> <!--<!– size="mini"–>--> <!--<!– :disabled="multiple"–>--> <!--<!– @click="handleDelete"–>--> <!--<!– v-hasPermi="['om:productionOrde:remove']"–>--> <!--<!– >删除</el-button>–>--> <el-col :span="1.5"> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['om:productionOrde:add']" >新增</el-button> </el-col> <el-col :span="1.5"> <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['om:productionOrde:edit']" >修改</el-button> </el-col> <el-col :span="1.5"> <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['om:productionOrde:remove']" >删除</el-button> <!-- <el-button--> <!-- type="info"--> <!-- icon="el-icon-upload2"--> @@ -203,7 +203,7 @@ <!-- :disabled="single"--> <!-- @click="jieBang"--> <!-- >解绑</el-button>--> <!-- </el-col>--> </el-col> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> </el-row> @@ -288,23 +288,23 @@ {{titleName}} </span> <el-form ref="form" inline :model="form" :rules="rules" label-width="100px"> <el-form-item label="生产工单号" prop="workOrderNo"> <el-input style="width: 265px" v-model="form.workOrderNo" placeholder="请输入生产工单号" /> </el-form-item> <el-form-item label="订单编号" prop="salesOrderCode"> <el-input style="width: 265px" v-model="form.salesOrderCode" placeholder="请输入订单编号" /> <el-form-item label="生产订单号" prop="workOrderNo"> <el-input style="width: 265px" v-model="form.workOrderNo" placeholder="请输入生产订单号" /> </el-form-item> <el-form-item label="产品序列号" prop="productNum"> <el-input v-model="form.productCode" placeholder="请选择产品" > <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button> </el-input> <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect> <el-input style="width: 265px" v-model="form.productNum" placeholder="请输入产品序列号" /> </el-form-item> <el-form-item label="产品名称" prop="productName"> <el-input style="width: 265px" v-model="form.productName" disabled placeholder="请输入产品名称" /> </el-form-item> <el-form-item label="产品型号" prop="productModel"> <el-input v-model="form.productModel" placeholder="请输入产品型号" /> <!-- <el-form-item label="产品序列号" prop="productNum">--> <!-- <el-input v-model="form.productCode" placeholder="请选择产品" >--> <!-- <el-button slot="append" @click="handleSelectProduct" icon="el-icon-search"></el-button>--> <!-- </el-input>--> <!-- <ItemSelect ref="itemSelect" @onSelected="onItemSelected" > </ItemSelect>--> <!-- </el-form-item>--> <!-- <el-form-item label="产品名称" prop="productName">--> <!-- <el-input style="width: 265px" v-model="form.productName" disabled placeholder="请输入产品名称" />--> <!-- </el-form-item>--> <el-form-item label="产品型号" prop="productCode"> <el-input v-model="form.productCode" placeholder="请输入产品型号" /> </el-form-item> <el-form-item label="工厂编号" prop="siteCode"> <el-input style="width: 265px" v-model="form.siteCode" placeholder="请输入工厂编号" />
