更新业务代码

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/CuttingToolApplyMapper.xml

@@ -101,7 +101,7 @@
                      LEFT JOIN imcs_s_stock_info issi on ict.id = issi.goods_id and issi.goods_type='6'
                      LEFT JOIN imcs_s_storge iss on issi.storge_id = iss.id
                      LEFT JOIN imcs_tenant_productionresource itp ON icta.resource_id = itp.id
-                     LEFT JOIN imcs_o_order ioo on icta.produce_id = ioo.id and ioo.single_task_flag='1'
+                     LEFT JOIN imcs_o_order ioo on icta.produce_id = ioo.id and ioo.single_task_flag='0'
             ) tmp ${ew.customSqlSegment}
     </select>
 

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/CuttingToolApplyController.java

@@ -31,6 +31,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -140,6 +141,12 @@ public class CuttingToolApplyController extends SuperCacheController<CuttingTool
         String addCutToolTaskUrl = hostSystemUrl + "/api/authority/toolbar/addCutToolTask";
 
         dataList.stream().forEach(item->{
+            if(StringUtils.isEmpty(item.getStart())){
+                //刀具线内不存在
+                item.setProcessStatus("1");
+                baseService.updateAllById(item);
+                return;
+            }
             JSONObject params = new JSONObject();
             params.put("start", "CT_"+ item.getStart());
             ProductionresourcePosition productionresourcePosition = productionresourcePositionService.getOne(new LbqWrapper<ProductionresourcePosition>().eq(ProductionresourcePosition::getPointId, item.getResourceId()).like(ProductionresourcePosition::getPointId, "CNCT").last("LIMIT 1"));