0517

src/main/java/cn/ezhizao/project/business/product/controller/BizCarrierController.java

@@ -282,7 +282,8 @@ public class BizCarrierController extends BaseController {
         BizCarrier carrier = new BizCarrier();
         carrier.setId(bizDaywork.getNewCarrierId());
         BizCarrier bizCarrier = bizCarrierService.getList(carrier).get(0);
-        if (bizCarrier.getIsAbandoned() == 1) {
+        List<BizCarrierReject> carrierRejects = bizCarrierRejectService.query().eq("carrier_id",bizDaywork.getNewCarrierId()).orderByDesc("create_time").list();
+        if (!carrierRejects.isEmpty() && carrierRejects.get(0).getIsAbandoned() == 1) {
             return error("该载具已被废弃");
         }
         // 检测新箱和旧箱是否是一个类型

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -804,6 +804,57 @@ public class BizDayworkItemController extends BaseController {
     public AjaxResult remove(@PathVariable List<Long> ids) {
         return toAjax(bizDayworkItemService.removeBatchByIds(ids));
     }
+   //修改周转信息
+    @Transactional
+    @PutMapping("/updateTurnoverInfo")
+    public AjaxResult updateTurnoverInfo(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException,IllegalAccessException {
+        //查到需要修改的周转信息
+        BizDayworkItem dayworkItem = bizDayworkItemService.query().eq("daywork_id", bizDayworkItem.getDayworkId())
+                .eq("process_step_number", bizDayworkItem.getProcessStepNumber())
+                .eq("status", 4).list().get(0);
+            //车间外周转
+            dayworkItem.setDeptId(bizDayworkItem.getDeptId());
+            dayworkItem.setDeptName(bizDayworkItem.getDeptName());
+        bizDayworkItemService.updateById(dayworkItem);
+        //修改daywork表信息
+        BizDaywork daywork = bizDayworkService.query().eq("id", bizDayworkItem.getDayworkId()).list().get(0);
+        daywork.setDeptId(dayworkItem.getDeptId());
+        bizDayworkService.updateById(daywork);
+        // 自动派活
+        SysDept sysDept = sysDeptMapper.selectDeptById(dayworkItem.getDeptId());
+        if (sysDept.getAutoAllocation() == 1) {
+            // 查资源组
+            List<BizProductionResourceGroup> productionResourceGroupList = bizProductionResourceGroupService.list(new QueryWrapper<BizProductionResourceGroup>().eq("dept_id", bizDayworkItem.getDeptId()).eq("is_deactivate", 0));
+
+            //查询是否已经分配资源组
+            BizProductionResourceGroupSubPlan groupSubPlan=new BizProductionResourceGroupSubPlan();
+            groupSubPlan.setDeptId(bizDayworkItem.getDeptId());
+            groupSubPlan.setProductionPlanDetailId(bizDayworkItem.getProductionPlanDetailId());
+
+            List<BizProductionResourceGroupSubPlan> groupSubPlanList = bizProductionResourceGroupSubPlanService.getAotList(groupSubPlan);
+            //如果没分配
+            if(groupSubPlanList.size()==0){
+                //查产品id
+                BizProductionPlanDetail productionPlanDetail = bizProductionPlanDetailService.getOne(new QueryWrapper<BizProductionPlanDetail>().eq("id", bizDayworkItem.getProductionPlanDetailId()));
+                //存放保存的subPlanList
+                List<BizProductionResourceGroupSubPlan> subPlanList = new ArrayList<>();
+                for (BizProductionResourceGroup info : productionResourceGroupList) {
+                    BizProductionResourceGroupSubPlan subPlan = new BizProductionResourceGroupSubPlan();
+                    subPlan.setProductId(productionPlanDetail.getProductId());
+                    subPlan.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
+                    subPlan.setTechnologicalProcessId(daywork.getTechnologicalProcessId());
+                    subPlan.setResourceGroupId(info.getId());
+                    subPlan.setDeptId(bizDayworkItem.getDeptId());
+                    subPlan.setResourceGroupCode(info.getCode());
+                    subPlanList.add(subPlan);
+                }
+                bizProductionResourceGroupSubPlanService.saveBatch(subPlanList);
+            }
+
+        }
+
+        return success();
+}
     /***       外协周转。暂时注释       ***/
     @Log(title="外协周转申请")
     @Transactional

src/main/java/cn/ezhizao/project/business/product/domain/BizDayworkItem.java

@@ -265,4 +265,6 @@ public class BizDayworkItem extends BaseEntity
     private Long technicianId;
     @TableField(exist = false)
     private String keywords;
+    @TableField(exist = false)
+    private Long lastDeptId;
 }

src/main/java/cn/ezhizao/project/business/workshop/controller/BizWorkshopController.java

@@ -8,6 +8,7 @@ import cn.ezhizao.project.business.turnover.domain.BizTurnover;
 import cn.ezhizao.project.business.workshop.domain.BizWorkshopTurnover;
 import cn.ezhizao.project.business.workshop.service.IBizWorkshopTurnoverService;
 import cn.ezhizao.project.system.domain.SysDept;
+import cn.ezhizao.project.system.mapper.SysDeptMapper;
 import cn.ezhizao.project.system.service.ISysDeptService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,8 @@ public class BizWorkshopController extends BaseController {
 
     @Resource
     private IBizWorkshopTurnoverService iBizWorkshopTurnoverService;
+    @Resource
+    private SysDeptMapper sysDeptMapper;
 
     /**
      * 查询周转区列表
@@ -48,4 +51,15 @@ public class BizWorkshopController extends BaseController {
 
         return success(workshopTurnovers);
     }
+    @PostMapping("/outsourceTurnover")
+    public AjaxResult outsourceTurnover(@RequestBody Map<String, Object> data) throws NoSuchFieldException, IllegalAccessException {
+        String deptCode = (data.get("deptCode").toString());
+        SysDept sysDept = sysDeptMapper.selectDeptByCode(deptCode);
+        List<BizWorkshopTurnover> workshopTurnovers = iBizWorkshopTurnoverService.query()
+                .eq("workshop_id", sysDept.getWorkshopId())
+                .eq("status",0)
+                .list();
+
+        return success(workshopTurnovers);
+    }
 }