SPS拉动单打印

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java

@@ -193,8 +193,18 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
                 List<MesPullingOrderPartInfo> pullingOrderPartInfos = mesPullingOrderPartInfoRepository.findByHqlWhere(partPackBean);
                 if (!CollectionUtils.isEmpty(pullingOrderPartInfos)) {
                     pullingOrderInfo.setPartCount(pullingOrderPartInfos.size());
+                    pullingOrderPartInfos.forEach(item->{
+                        if(!StringUtil.isEmpty(item.getLocation()) && item.getLocation().contains(MesPcnExtConstWords.COMMA)){
+                            item.setLocatAddr(item.getLocation().split(MesPcnExtConstWords.COMMA)[0]);
+                            item.setLightAddr(item.getLocation().split(MesPcnExtConstWords.COMMA)[1]);
+                        }
+                    });
                     pullingOrderInfo.setPullingOrderPartInfos(pullingOrderPartInfos);
                 }
+                pullingOrderInfo.setWorkOrderNoLast(!StringUtil.isEmpty(pullingOrderInfo.getWorkOrderNo())?pullingOrderInfo.getWorkOrderNo().substring(pullingOrderInfo.getWorkOrderNo().length() - MesPcnExtConstWords.THREE):"");
+                pullingOrderInfo.setWorkOrderNo(!StringUtil.isEmpty(pullingOrderInfo.getWorkOrderNo())?pullingOrderInfo.getWorkOrderNo().substring(MesPcnExtConstWords.ZERO,pullingOrderInfo.getWorkOrderNo().length() - MesPcnExtConstWords.THREE):"");
+                pullingOrderInfo.setCustOrderNoLast(!StringUtil.isEmpty(pullingOrderInfo.getCustOrderNo())?pullingOrderInfo.getCustOrderNo().substring(pullingOrderInfo.getCustOrderNo().length() - MesPcnExtConstWords.FOUR):"");
+                pullingOrderInfo.setPartName("车型："+pullingOrderInfo.getPartName());
 
                 pullingOrderInfo.setPrintTime(TimeTool.getNowTime(true));
                 pullingOrderInfo.setPrintStatus(MesExtEnumUtil.PRINT_STATUS.PRINTED.getValue());