diff --git a/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderCutService.java b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderCutService.java new file mode 100644 index 0000000..6cdcb50 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-api/src/main/java/cn/estsh/i3plus/ext/mes/pcn/api/busi/IMesWorkOrderCutService.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.ext.mes.pcn.api.busi; + +import cn.estsh.i3plus.pojo.mes.bean.*; +import io.swagger.annotations.ApiOperation; + +import java.util.List; + + +/** + * @Description : + * @Reference : + * @Author : + * @CreateDate : 2024-04-26 15:37 + * @Modify: + **/ +public interface IMesWorkOrderCutService { + + + @ApiOperation(value = "查询裁片工单") + MesWorkOrderCut getMesWorkOrderCut(String cutWorkOrderNo, String organizeCode); + + @ApiOperation(value = "查询裁片工单明细") + List queryMesWorkOrderCutDetailList(String cutWorkOrderNo, String organizeCode); + + @ApiOperation(value = "查询裁片工单明细") + MesCutScheme getCutScheme(String cutCode, String organizeCode); + +} diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java new file mode 100644 index 0000000..473e8c2 --- /dev/null +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderCutService.java @@ -0,0 +1,56 @@ +package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderCutService; +import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.mes.bean.MesCutScheme; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCut; +import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderCutDetail; +import cn.estsh.i3plus.pojo.mes.repository.MesCutSchemeRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderCutDetailRepository; +import cn.estsh.i3plus.pojo.mes.repository.MesWorkOrderCutRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.xml.ws.Action; +import java.util.List; + +/** + * @PROJECT_NAME: i3plus-mes-yfai + * @DESCRIPTION: + * @USER: xinwang.yi + * @DATE: 2024-09-07 10:57 + */ +@Service +public class MesWorkOrderCutService implements IMesWorkOrderCutService { + + @Autowired + private MesWorkOrderCutRepository workOrderCutRepository; + + @Autowired + private MesWorkOrderCutDetailRepository workOrderCutDetailRepository; + + @Autowired + private MesCutSchemeRepository cutSchemeRepository; + + @Override + public MesWorkOrderCut getMesWorkOrderCut(String cutWorkOrderNo, String organizeCode) { + return workOrderCutRepository.getByProperty( + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.CUT_WORK_ORDER_NO}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), cutWorkOrderNo}); + } + + @Override + public List queryMesWorkOrderCutDetailList(String cutWorkOrderNo, String organizeCode) { + return workOrderCutDetailRepository.findByProperty( + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.CUT_WORK_ORDER_NO}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), cutWorkOrderNo}); + } + + @Override + public MesCutScheme getCutScheme(String cutCode, String organizeCode) { + return cutSchemeRepository.getByProperty( + new String[]{MesPcnExtConstWords.ORGANIZE_CODE, MesPcnExtConstWords.IS_DELETED, MesPcnExtConstWords.IS_VALID, MesPcnExtConstWords.CUT_CODE}, + new Object[]{organizeCode, CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), CommonEnumUtil.IS_VAILD.VAILD.getValue(), cutCode}); + } +} diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionPartContext.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionPartContext.java index 2fa662f..6a3d25f 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionPartContext.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/context/MesProductionPartContext.java @@ -2,9 +2,7 @@ package cn.estsh.i3plus.ext.mes.pcn.pojo.context; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.mes.bean.MesMouldMultiCavity; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder; +import cn.estsh.i3plus.pojo.mes.bean.*; import cn.estsh.i3plus.pojo.mes.util.MesExtEnumUtil; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -136,6 +134,16 @@ public class MesProductionPartContext implements Serializable { return messageSource(messageSource); } + //根据工单信息赋值 + public MesProductionPartContext copyPartNo(MesWorkOrder workOrder, Double qty, Integer messageSource) { + if (null != workOrder) { + BeanUtils.copyProperties(workOrder, this); + if (StringUtils.isEmpty(this.completeQty)) this.completeQty = new Double(0); + this.setQty(qty); + } else this.isFinishCode = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); + return messageSource(messageSource); + } + public MesProductionPartContext isFinishCode() { this.isFinishCode = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); return this; diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index f4d53c5..6418843 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -430,4 +430,9 @@ public class MesPcnExtConstWords { public static final String SN = "sn"; //工单状态 public static final String WORK_ORDER_STATUS = "workOrderStatus"; + // 工位是否修改裁片工单状态为完成状态参数[工位参数] + public static final String CUT_ORDER_ORDER_IS_COMPLETE = "CUT_ORDER_ORDER_IS_COMPLETE"; + + // 裁片方案代码 + public static final String CUT_CODE = "cutCode"; }