diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java index 51ca1d1..3663716 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java @@ -172,7 +172,7 @@ public class MesPullingOrderInfoService extends BaseMesService mesPartPullDetails = stringListEntryDetail.getValue(); //拉动组号+年月日+工单后5位 - String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyyy-MM-dd") + + String orderNo = mesPartPull.getPullCode()+ TimeTool.getNowTime("yyMMdd") + mesWorkOrder.getWorkOrderNo().substring(mesWorkOrder.getWorkOrderNo().length()-5); // if (mesPartPull.getPullOrderType() == MesExtEnumUtil.PART_PULL_ORDER_TYPE.KITTING_PULL.getValue()) { // orderNo = "KITTING";