aps-取消发布坯料计划时，判断是否是备料，如果是，则撤回

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

@@ -343,7 +343,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
     private R removeBatchNumberByBlankId(String blankId) {
         ApsBlankOrderDo apsBlankOrderDo = apsBlankOrderService.getById(blankId);
         //如果是否备料=是，备料对应在制品的备料计划ID=(空)，在制品状态=备料中
-        if (ObjectUtil.isNotEmpty(apsBlankOrderDo.getPreparematerialbatchno())) {
+        if (ObjectUtil.isNotEmpty(apsBlankOrderDo.getPreparematerialbatchno()) && apsBlankOrderDo.getPreparematerial().equals("否")) {
             List<String> batchNumberList = Arrays.asList(apsBlankOrderDo.getPreparematerialbatchno().split(","));
             apsWorkInProgressInventoryService.update(new UpdateWrapper<ApsWorkInProgressInventoryDo>().lambda()
                     .set(ApsWorkInProgressInventoryDo::getPlanmaterialid, null)