diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java index c4bef2b..e382228 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/base/SxRepairWorkService.java @@ -978,9 +978,9 @@ public class SxRepairWorkService implements ISxRepairWorkService { if (isFinalCheckAfterSn) { unbindKeyResult = prodBindRecordExtRepository.updateByProperties( new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.IS_DELETED, - MesPcnExtConstWords.PRODUCT_SN, MesPcnExtConstWords.IS_BIND_KEY, MesPcnExtConstWords.ACTION_TYPE}, - new Object[]{organizeCode, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - produceSnExt.getProductSn(), MesPcnExtEnumUtil.MES_IS_BIND_KEY.IS_BIND_KEY.getValue(), MesPcnExtEnumUtil.MES_ACTION_TYPE.BIND.getValue()}, + MesPcnExtConstWords.PRODUCT_SN, MesPcnExtConstWords.WORK_ORDER_NO, MesPcnExtConstWords.IS_BIND_KEY, MesPcnExtConstWords.ACTION_TYPE}, + new Object[]{organizeCode, MesPcnExtConstWords.WORK_ORDER_NO, CommonEnumUtil.IS_VAILD.VAILD.getValue(), CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + produceSnExt.getProductSn(), workOrderNo, MesPcnExtEnumUtil.MES_IS_BIND_KEY.IS_BIND_KEY.getValue(), MesPcnExtEnumUtil.MES_ACTION_TYPE.BIND.getValue()}, new String[]{MesPcnExtConstWords.ACTION_TYPE, MesPcnExtConstWords.MODIFY_USER, MesPcnExtConstWords.MODIFY_DATE_TIME}, new Object[]{MesPcnExtEnumUtil.MES_ACTION_TYPE.UNTYING.getValue(), modifyUser, TimeTool.getNowTime(true)}); } else { diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeDispatchService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeDispatchService.java index bc2c129..621dcee 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeDispatchService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeDispatchService.java @@ -111,8 +111,8 @@ public class SxSubassemblyRemadeDispatchService { //detail.setWorkCenterCode(workCenterCode); //detail.setWorkOrderNo(workOrderNo); //detail.setQty(packageDb.getQty()); - BeanUtils.copyProperties(subassemblyRemadeRecordDb, detail); + detail.setQty(detail.getInitQty()); detail.setSn(sn); detail.setScanDatetime(TimeTool.getNowTime(true)); return detail; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeService.java index b9dd4fb..f905c30 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/SxSubassemblyRemadeService.java @@ -568,7 +568,6 @@ public class SxSubassemblyRemadeService implements ISxSubassemblyRemadeService { MesSubassemblyRemadeRecord record = subassemblyRemadeRecordRepository.getById(detail.getId()); //MesSubassemblyRemadeRecord record = new MesSubassemblyRemadeRecord(); - record.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()); //record.setSn(detail.getSn()); //record.setPackageNo(detail.getPackageNo()); //record.setCtNo(detail.getCtNo()); @@ -581,10 +580,13 @@ public class SxSubassemblyRemadeService implements ISxSubassemblyRemadeService { //record.setWorkCenterCode(modelCached.getWorkCenterCode()); //record.setPartNo(modelCached.getPartNo()); //record.setPartNameRdd(modelCached.getPartNameRdd()); + record.setSn(detail.getSn()); + record.setQty(detail.getQty()); record.setWorkTime(workCenterExt.getWorkTime()); record.setShiftCode(workCenterExt.getShiftCode()); record.setOrganizeCode(modelCached.getOrganizeCode()); ConvertBean.serviceModelInitialize(record, userInfo); + record.setSystemSyncStatus(MesPcnExtEnumUtil.IF_SYNC_STATUS.NO_SYNC.getValue()); subassemblyRemadeRecordRepository.save(record); } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesEquipmentCheck.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesEquipmentCheck.java index 6f8ed59..7163f1f 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesEquipmentCheck.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesEquipmentCheck.java @@ -61,6 +61,10 @@ public class MesEquipmentCheck extends BaseBean implements Serializable { @ApiParam("设备名称") private String equName; + @Column(name = "EQU_MANAGE_NO") + @ApiParam("设备管理号") + private String equManageNo; + @Column(name = "PROJECT_CONTENT") @ApiParam("项目内容") private String projectContent;