jiaxin.lin
/
i3plus-mes-yfai
forked from I3-YF/i3plus-mes-yfai
1
0
Fork 0
Code Pull Requests Activity

添加缺少字段

Browse Source
tags/yfai-mes-ext-v2.3
臧学普 7 months ago
parent c838de8675
commit a5eef7febd
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File

30
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/roundness/MesPackageRoundnessService.java
Unescape Escape View File

@ -186,7 +186,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
String organizeCode = partProdGroup.getOrganizeCode();
MesWorkOrder mesWorkOrder = new MesWorkOrder();
mesWorkOrder.setCustCode(partProdGroup.getCustCode());
//工单版本号
mesWorkOrder.setProductVersion("1");
//工单类型
@ -282,8 +282,8 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
mesWorkOrder.setPartProdGroupCode(partProdGroup.getPartProdGroupCode());
mesWorkOrder.setCarModelCode(sortInfo.getVehicleNo());
mesWorkOrder.setFid(UUID.randomUUID().toString());
mesWorkOrder.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
/**
* RS 为记录分隔符ASCII:30
* GS 为分组符ASCII:29
@ -332,7 +332,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
custGenSerialNoModel.setPartNo(prefix+partNo4);
String year = custCalendar.get(Calendar.YEAR)+"";
custGenSerialNoModel.setYear(year.substring(2));
custGenSerialNoModel.setDay(custCalendar.get(Calendar.DAY_OF_YEAR)+"");
custGenSerialNoModel.setDay(String.format("%03d",custCalendar.get(Calendar.DAY_OF_YEAR)));
List<String> custNumRuleList = syncFuncService.syncSerialNo(custGenSerialNoModel, "edi", organizeCode, 1).getResultList();
// [)>%RS%06%GS%Y,4110000000000X,%GS%P,%GS%12V,545238347,%GS%T1A,A2B4C,%RS%%EOT%
//截取替换为ascii码
@ -352,7 +352,7 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
String[] split2 = gsStr.toString().split("%EOT%");
String sn = split2[0]+(char)4;
//保存条码
mesWorkOrder.setSn(sn);
mesWorkOrder.setCustSn(sn);
@ -487,11 +487,13 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
mesQueueOrder.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
mesQueueOrder.setSerialNumber(mesWorkOrder.getWorkOrderNo());
mesQueueOrder.setProductSn(mesWorkOrder.getWorkOrderNo());
mesQueueOrder.setCustSn(mesWorkOrder.getSn());
mesQueueOrder.setCustSn(mesWorkOrder.getCustSn());
mesQueueOrder.setStatus(MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
mesQueueOrder.setProduceSeq(mesWorkOrder.getProduceSeq());
mesQueueOrder.setWorkOrderSeq(mesWorkOrder.getWorkOrderSeq());
mesQueueOrder.setCustPartNo(mesWorkOrder.getCustPartNo());
mesQueueOrder.setCustOrderNo(mesWorkOrder.getCustOrderNo());
mesQueueOrder.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
ConvertBean.saveOrUpdate(mesQueueOrder, "MES-JOB");
queueOrderRao.insert(mesQueueOrder);
}
@ -501,9 +503,23 @@ public class MesPackageRoundnessService implements IRoundnessStrategy {
//生成条码表
MesProduceSn mesProduceSn = new MesProduceSn();
mesProduceSn.setProductSn(mesWorkOrder.getWorkOrderNo());
mesProduceSn.setCustSn(mesWorkOrder.getSn());
mesProduceSn.setCustSn(mesWorkOrder.getCustSn());
mesProduceSn.setWorkOrderNo(mesWorkOrder.getWorkOrderNo());
mesProduceSn.setOrganizeCode(organizeCode);
mesProduceSn.setFid(UUID.randomUUID().toString());
mesProduceSn.setCustCode(mesWorkOrder.getCustCode());
mesProduceSn.setCustPartNo(mesWorkOrder.getCustPartNo());
mesProduceSn.setPartNo(mesWorkOrder.getPartNo());
mesProduceSn.setPartName(mesWorkOrder.getPartName());
mesProduceSn.setShiftCode(mesWorkOrder.getShiftCode());
mesProduceSn.setWorkCenterCode(mesWorkOrder.getWorkCenterCode());
mesProduceSn.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
mesProduceSn.setQcStatus(MesExtEnumUtil.PRODUCE_QC_STATUS.QUALIFIED.getValue());
mesProduceSn.setQty(1.0);
mesProduceSn.setSerialNumber(mesWorkOrder.getWorkOrderNo());
mesProduceSn.setSnStatus(MesExtEnumUtil.PRODUCE_SN_STATUS.CREATE.getValue());
mesProduceSn.setSnType(MesExtEnumUtil.PRODUCE_SN_TYPE.STANDARD.getValue());
mesProduceSn.setFid(UUID.randomUUID().toString());
ConvertBean.saveOrUpdate(mesProduceSn, "MES-JOB");
mesProduceSnRao.insert(mesProduceSn);

Write Preview
Loading…
Cancel
Save