aps-借调需要用户确认

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -4496,6 +4496,11 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     }
 
                 }
+                if ("待加工".equals(apsWorkInProgressInventoryDo.getWorkinprocessstatus())) {
+                    if (StringUtils.isNotBlank(apsWorkInProgressInventoryDo.getBlanknumber())) {
+                        res = res + "<b>批次号" + s + "是坯料计划" + apsWorkInProgressInventoryDo.getBlanknumber() + "的在制品，确认借调该料卷吗？</b><br>";
+                    }
+                }
 
 //            //查找该批次号物料=在制品的作业输出物料ID对应输出物料
 //            //如果{该批次号物料的输入物料描述}与{坯料的输入物料描述}不相同，或者坯料类型不等于坯料计划的坯料类型
@@ -4544,7 +4549,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
                     }
                 }
 
-                res = "<b>" + String.join(",", offLineBatchNumberList) + "是线下批次号，确认领料吗？</b><br>";
+                res = res + "<b>" + String.join(",", offLineBatchNumberList) + "是线下批次号，确认领料吗？</b><br>";
             }
             if (ObjectUtil.isNotEmpty(onLineBatchNumberWarnList)) {
                 for (String s : onLineBatchNumberWarnList) {