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
yxw 8 months ago
parent 15c92222d6
commit 54627db4b1
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File

6
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesWorkOrderCutController.java
Unescape Escape View File

@ -85,12 +85,12 @@ public class MesWorkOrderCutController extends BaseMesController<MesWorkOrderCut
@PostMapping(value = "/update-print-status")
@ApiOperation(value = "修改裁片工单打印状态", notes = "修改裁片工单打印状态")
public ResultBean doUpdatePrintStatus(String[] cutWorkOrderNos) {
public ResultBean doUpdatePrintStatus(String[] cutWorkOrderIds) {
try {
ValidatorBean.checkNotNull(cutWorkOrderNos, "裁片工单不存在");
ValidatorBean.checkNotNull(cutWorkOrderIds, "裁片工单不存在");
workOrderCutService.doUpdatePrintStatus(Arrays.asList(cutWorkOrderNos), AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
workOrderCutService.doUpdatePrintStatus(Arrays.asList(cutWorkOrderIds), AuthUtil.getOrganize().getOrganizeCode(), AuthUtil.getSessionUser().getUserName());
return ResultBean.success("发布成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {

2
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderCutService.java
Unescape Escape View File

@ -117,6 +117,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
workOrderCut.setCutWorkOrderNo(cutWorkOrderNo);
workOrderCut.setOrganizeCode(organizeCode);
workOrderCut.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.UNPRINT.getValue());
workOrderCuttList.add(workOrderCut);
for (MesCutSchemeMaterial cutSchemeMaterial : cutSchemeMaterialList) {
@ -345,6 +346,7 @@ public class MesWorkOrderCutService extends BaseMesService<MesWorkOrderCut> impl
workOrderCutDbList.forEach(o -> {
o.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue());
o.setPrintTime(TimeTool.getNowTime(true));
ConvertBean.serviceModelUpdate(o, userName);
o.setSystemSyncStatus(CommonEnumUtil.FALSE);
});

32
modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/print/strategy/CutWorkOrderNoPrintStrategy.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.print.strategy;
import cn.estsh.i3plus.ext.mes.apiservice.serviceimpl.print.IPrintTemplateStrategyService;
import cn.estsh.i3plus.ext.mes.pojo.model.MesProduceSnPrintModel;
import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
@ -55,13 +56,11 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
// 裁片方案代码集合
List<String> cutCodeList = workOrderCutList.stream().map(MesWorkOrderCut::getCutCode).distinct().collect(Collectors.toList());
List<MesCutSchemeFg> cutSchemeFgList = getMesCutSchemeFgs(cutCodeList);
List<MesCutSchemeMaterial> cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList);
//根据裁片方案代码对裁片方案成品明细分组
Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode));
Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = getCutSchemeFgMapByCutCode(cutCodeList);
List<MesCutSchemeMaterial> cutSchemeMaterialList = getMesCutSchemeMaterials(cutCodeList);
//根据裁片方案代码对裁片方案原材料分组
Map<String, List<MesCutSchemeMaterial>> cutSchemeMaterialMapByCutCode = cutSchemeMaterialList.stream().collect(Collectors.groupingBy(MesCutSchemeMaterial::getCutCode));
@ -92,9 +91,10 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
resultMap.put(MesExtConstWords.CUT_WORK_ORDER_NO, workOrderCut.getCutWorkOrderNo());
resultMap.put(MesExtConstWords.CUT_NAME, workOrderCut.getCutName());
// 拉料信息 START
// 原材料零件号
resultMap.put(MesExtConstWords.RAW_PART_NO, cutSchemeMaterial.getPartNo());
// 拉料信息 START
resultMap.put(MesExtConstWords.PULLING_MATERIAL_LENGTH, cutSchemeMaterial.getPullingMaterialLength());
resultMap.put(MesExtConstWords.PULLING_MATERIAL_LAYER_NUMBER, cutSchemeMaterial.getPullingMaterialLayerNumber());
resultMap.put(MesExtConstWords.PER_LAYER_NUMBER, cutSchemeMaterial.getPerLayerNumber());
@ -102,21 +102,11 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
resultMap.put(MesExtConstWords.USING_LENGTH, cutSchemeMaterial.getUsingLength());
resultMap.put(MesExtConstWords.LAYER_NUMBER, cutSchemeMaterial.getLayerNumber());
resultMap.put(MesExtConstWords.TENSION_PARAM, cutSchemeMaterial.getTensionParam());
resultMap.put(MesExtConstWords.PRINT_TIME, TimeTool.getNowTime("yyyy-M-d H:mm:ss"));
// 拉料信息 END
//int index = 1;
//for (MesCutSchemeEquipment mesCutSchemeEquipment : cutSchemeEquipmentListByCutCode) {
// //设备信息
// resultMap.put(MesExtConstWords.TITLE + index, mesCutSchemeEquipment.getValue());
//
// index++;
//}
MesCutSchemeEquipment mesCutSchemeEquipment = CollectionUtils.isEmpty(cutSchemeEquipmentListByCutCode) ? null : cutSchemeEquipmentListByCutCode.get(0);
List<String> equipParamNameList = new ArrayList<>();
List<String> equipParamValueList = new ArrayList<>();
List<MesCutSchemeEquipmentDetail> cutSchemeEquipmentDetails = mesCutSchemeEquipment == null || CollectionUtils.isEmpty(cutSchemeEquipmentDetailMapByPid) ? new ArrayList<>() : cutSchemeEquipmentDetailMapByPid.get(mesCutSchemeEquipment.getId());
for (int i = 0; i < EQUIP_NUM; i++) {
@ -129,8 +119,6 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
//设备参数值1
resultMap.put(MesExtConstWords.EQUIP_PARAM_VALUE+(l+1), cutSchemeEquipmentDetails.get(l).getName());
} else {
equipParamNameList.add("");
equipParamValueList.add("");
//设备参数值标题1
resultMap.put(MesExtConstWords.EQUIP_PARAM_NAME+(l+1), "");
//设备参数值1
@ -159,6 +147,14 @@ public class CutWorkOrderNoPrintStrategy implements IPrintTemplateStrategyServic
return model;
}
private Map<String, List<MesCutSchemeFg>> getCutSchemeFgMapByCutCode(List<String> cutCodeList) {
List<MesCutSchemeFg> cutSchemeFgList = getMesCutSchemeFgs(cutCodeList);
//根据裁片方案代码对裁片方案成品明细分组
Map<String, List<MesCutSchemeFg>> cutSchemeFgMapByCutCode = cutSchemeFgList.stream().collect(Collectors.groupingBy(MesCutSchemeFg::getCutCode));
return cutSchemeFgMapByCutCode;
}
private BigDecimal[] divideAndRemainder(Double qty, Double packageQty) {
BigDecimal dividend = new BigDecimal(qty.toString());
BigDecimal divisor = new BigDecimal(packageQty.toString());

2
modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java
Unescape Escape View File

@ -296,6 +296,8 @@ public class MesExtConstWords {
public static final String PARAM = "param";
//成品零件号
public static final String FG_PART_NO = "fgPartNo";
// 打印时间
public static final String PRINT_TIME = "printTime";
}

Write Preview
Loading…
Cancel
Save