0604

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

@@ -17,8 +17,10 @@ import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGro
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupSubPlanService;
+import cn.ezhizao.project.business.turnover.service.IBizTurnoverService;
 import cn.ezhizao.project.business.workshop.domain.BizWorkshop;
 import cn.ezhizao.project.business.workshop.service.IBizWorkshopService;
+import cn.ezhizao.project.business.workshop.service.IBizWorkshopTurnoverService;
 import cn.ezhizao.project.system.domain.SysDept;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.service.ISysDeptService;
@@ -72,6 +74,10 @@ public class BizQuickDayworkController extends BaseController {
     private IBizLotTechnologicalProcessService bizLotTechnologicalProcessService;
     @Resource
     private IBizLotTechnologicalProcessDetailService bizLotTechnologicalProcessDetailService;
+    @Resource
+    private IBizWorkshopTurnoverService bizWorkshopTurnoverService;
+    @Resource
+    private IBizTurnoverService bizTurnoverService;
 
     @Resource
     SnowflakeIdWorker snowflakeIdWorker;
@@ -360,10 +366,12 @@ public class BizQuickDayworkController extends BaseController {
         // 判断是车间内周转还是外周转
         if (!info.getWorkshopId().equals(dayworkItemList.get(0).getWorkshopId())) {
             info.setTurnoverType("2");
-            info.setTurnoverArea("1#东1门");
+            info.setTurnoverArea(bizWorkshopTurnoverService.query().eq("workshop_id", info.getWorkshopId()).eq("status",0).orderByAsc("create_time").list().get(0).getCode());
+//            info.setTurnoverArea("1#东1门");
         } else {
             info.setTurnoverType("1");
-            info.setPlace("默认区");
+            //info.setPlace("默认区");
+            info.setPlace(bizTurnoverService.query().eq("dept_id",info.getDeptId()).orderByAsc("create_time").list().get(0).getCode());
         }
         dayworkItemList.forEach(l -> {
             if (l.getStatus().equals("4")) {