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

打包

Browse Source
uat-temp-wj-shenshanorder
王杰 3 months ago
parent 6948872ca3
commit 808f999454
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File

8
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionPackageProgressService.java
Unescape Escape View File

@ -124,6 +124,7 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), BUSI_TYPE.valueOfDescription(packageDataContext.getBusiType()), packageDataContext.getPackageNo()));
}
String suffix;
//修改数量
if (BUSI_TYPE.THREE.getValue().equals(packageDataContext.getBusiType())) {
//仅统计包装才支持修改数量
@ -139,6 +140,9 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
return packResultMap(reqBean, resultBean, resultMap, String.format("生产线[%s]工位[%s]包装条码[%s]修改数量[%s]不能超过包装规格数量[%s],请刷新重试!",
reqBean.getWorkCenterCode(), reqBean.getWorkCellCode(), packageDataContext.getPackageNo(), packageDataContext.getQty(), packageDataContext.getPackSpecQty()));
}
suffix = String.format("包装条码ID[%s]原数量[%s]修改为[%s]", packageDb.getId(), packageDb.getQty(), packageDataContext.getQty());
//修改包装信息的数量
packageNoGenerateStepService.savePackageData(reqBean, packageDb, packageDataContext.getQty());
//打包数据更新数量(判断是增加还是减少数量)
@ -181,6 +185,8 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
packageNoGenerateStepService.deletePackageData(reqBean, packageDb, packageDataContextList.get(0).getGenerateType());
}
suffix = String.format("包装条码ID[%s]", packageDb.getId());
//打包数据移除当前零件的包装信息
packageDataContextMap.remove(packageDataContext.getPartNo());
@ -196,7 +202,7 @@ public class MesFunctionPackageProgressService extends BaseSwsService implements
else resultMap.put(MesPcnExtConstWords.DATA, resultList);
resultMap.put(MesPcnExtConstWords.DATA_TYPE, MesPcnEnumUtil.STATION_DATA_TYPE.TEXT.getValue());
return packResultMap(reqBean, resultBean, resultMap, String.format("零件号[%s]%s成功!", packageDataContext.getPartNo(), BUSI_TYPE.valueOfDescription(packageDataContext.getBusiType())));
return packResultMap(reqBean, resultBean, resultMap, String.format("%s成功!零件号[%s]%s", BUSI_TYPE.valueOfDescription(packageDataContext.getBusiType()), packageDataContext.getPartNo(), suffix));
}

14
modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/step/MesPackageNoGenerateStepService.java
Unescape Escape View File

@ -210,10 +210,10 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
String message;
//根据 物料代码,零件类型=包装物 查询成品包装明细规则
List<MesPackingRuleDetail> packingRuleDetailList = packingRuleService.getPackingRuleDetailList(reqBean.getOrganizeCode(), partNo, MesExtEnumUtil.PACKING_RULE_DETAIL_PART_TYPE.P.getValue());
//根据 物料代码,零件类型=零件 查询成品包装明细规则
List<MesPackingRuleDetail> packingRuleDetailList = packingRuleService.getPackingRuleDetailList(reqBean.getOrganizeCode(), partNo, MesExtEnumUtil.PACKING_RULE_DETAIL_PART_TYPE.I.getValue());
if (CollectionUtils.isEmpty(packingRuleDetailList)) {
message = String.format("零件编码[%s]未配置包装物类型的成品包装明细规则信息!", partNo);
message = String.format("零件编码[%s]未配置零件类型的成品包装明细规则信息!", partNo);
if (!isAsyn) this.sendMessage(reqBean, new StationResultBean().writeDbLog(), message, MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
else stepResult.msg(message);
return null;
@ -236,7 +236,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
MesPackingRuleDetail packingRuleDetail = filterPackingRuleDetail(packingRuleDetailList, packingRule);
if (StringUtils.isEmpty(packingRuleDetail.getPackageCode()) ||
StringUtils.isEmpty(packingRuleDetail.getPackSpecQty()) || MathOperation.compareTo(packingRuleDetail.getPackSpecQty(), new Double(0)) == 0) {
message = String.format("零件编码[%s]配置包装物类型的成品包装明细规则信息中必要信息无效:包装代码[%s]包装规格数量[%s]!", partNo, packingRuleDetail.getPackageCode(), packingRuleDetail.getPackSpecQty());
message = String.format("零件编码[%s]配置零件类型的成品包装明细规则信息中必要信息无效:包装代码[%s]包装规格数量[%s]!", partNo, packingRuleDetail.getPackageCode(), packingRuleDetail.getPackSpecQty());
if (!isAsyn) this.sendMessage(reqBean, new StationResultBean().writeDbLog(), message, MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
else stepResult.msg(message);
return null;
@ -249,7 +249,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
//如果 packageBarcodeRule || packageTemplate || printer 有一个为空, 则需要根据 箱类别代号查询包装定义, 但是 printer 不进行强验证,可能是否的是默认打印机
if (StringUtils.isEmpty(generateTypeName) || (StringUtils.isEmpty(packingRule.getPackCode()) && (StringUtils.isEmpty(packageBarcodeRule) || StringUtils.isEmpty(packageTemplate)))) {
message = String.format("零件编码[%s]包装物类型对应的包装代码[%s]配置的成品包装规则信息中必要信息无效:统计方式[%s]箱类别代号[%s]!",
message = String.format("零件编码[%s]零件类型对应的包装代码[%s]配置的成品包装规则信息中必要信息无效:统计方式[%s]箱类别代号[%s]!",
partNo, packingRuleDetail.getPackageCode(), StringUtils.isEmpty(generateTypeName) ? MesPcnExtConstWords.EMPTY : generateTypeName, packingRule.getPackCode());
if (!isAsyn) this.sendMessage(reqBean, new StationResultBean().writeDbLog(), message, MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
else stepResult.msg(message);
@ -262,7 +262,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
//判断是否需要查询包装定义
if (StringUtils.isEmpty(packageBarcodeRule) || StringUtils.isEmpty(packageTemplate) || StringUtils.isEmpty(printer)) {
if (null == packingDefine && (StringUtils.isEmpty(packageBarcodeRule) || StringUtils.isEmpty(packageTemplate))) {
message = String.format("零件编码[%s]包装物类型对应的包装代码[%s]配置成品包装规则信息中的箱类别代号[%s]未维护包装定义信息!", partNo, packingRuleDetail.getPackageCode(), packingRule.getPackCode());
message = String.format("零件编码[%s]零件类型对应的包装代码[%s]配置成品包装规则信息中的箱类别代号[%s]未维护包装定义信息!", partNo, packingRuleDetail.getPackageCode(), packingRule.getPackCode());
if (!isAsyn) this.sendMessage(reqBean, new StationResultBean().writeDbLog(), message, MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
else stepResult.msg(message);
return null;
@ -275,7 +275,7 @@ public class MesPackageNoGenerateStepService extends BaseStepService implements
//此时 packageBarcodeRule || packageTemplate 仍有一个为空则 记录日志 忽略当前零件的打包
if (StringUtils.isEmpty(packageBarcodeRule) || StringUtils.isEmpty(packageTemplate)) {
message = String.format("零件编码[%s]包装物类型对应的包装代码[%s]配置的成品包装规则信息中必要信息无效:编码规则[%s]模版[%s]打印机[%s]!", partNo, packingRuleDetail.getPackageCode(), packageBarcodeRule, packageTemplate, printer);
message = String.format("零件编码[%s]零件类型对应的包装代码[%s]配置的成品包装规则信息中必要信息无效:编码规则[%s]模版[%s]打印机[%s]!", partNo, packingRuleDetail.getPackageCode(), packageBarcodeRule, packageTemplate, printer);
if (!isAsyn) this.sendMessage(reqBean, new StationResultBean().writeDbLog(), message, MesPcnEnumUtil.STATION_BUSI_TYPE.MESSAGE, MesPcnEnumUtil.STATION_DATA_TYPE.EXP_TEXT);
else stepResult.msg(message);
return null;

Write Preview
Loading…
Cancel
Save