0701周转区校验

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

@@ -639,7 +639,8 @@ public class BizDayworkItemController extends BaseController {
                 item.setRecipientId(user.getUserId());
                 ids.add(item.getId());
                 BizTurnover turnover = bizTurnoverService.getOne(new QueryWrapper<BizTurnover>().eq("dept_id", item.getDeptId()).eq("status", 9));
-                item.setPlaceId(turnover.getId());
+                //0629placeId为字符属性
+                item.setPlaceId(turnover.getId()+"");
                 item.setPlace(turnover.getCode());
             } else {
                 item.setUserId(user.getUserId());
@@ -1092,6 +1093,7 @@ public class BizDayworkItemController extends BaseController {
                 bizItem.setDeptId(bizDayworkItem.getDeptId());
                 bizItem.setDeptName(bizDayworkItem.getDeptName());
                 bizItem.setStartTime(bizDayworkItem.getStartTime());
+                bizItem.setTurnoverId(bizDayworkItem.getTurnoverId());
                 bizItem.setTurnoverType(bizDayworkItem.getTurnoverType());
                 bizItem.setTurnoverArea(bizDayworkItem.getTurnoverArea());
                 bizItem.setPlaceId(bizDayworkItem.getPlaceId());

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

@@ -493,11 +493,17 @@ public class BizQuickDayworkController extends BaseController {
         if (!info.getWorkshopId().equals(dayworkItemList.get(0).getWorkshopId())) {
             info.setTurnoverType("2");
             info.setTurnoverArea(bizWorkshopTurnoverService.query().eq("workshop_id", info.getWorkshopId()).eq("status",0).orderByAsc("create_time").list().get(0).getCode());
-//            info.setTurnoverArea("1#东1门");
+            //0628快速报工将id存入
+            info.setTurnoverId(bizWorkshopTurnoverService.query().eq("workshop_id", info.getWorkshopId()).eq("status",0).orderByAsc("create_time").list().get(0).getId()+"");
+
+            //            info.setTurnoverArea("1#东1门");
         } else {
             info.setTurnoverType("1");
             //info.setPlace("默认区");
             info.setPlace(bizTurnoverService.query().eq("dept_id",info.getDeptId()).orderByAsc("create_time").list().get(0).getCode());
+            //0628快速报工将id存入
+            info.setPlaceId(bizTurnoverService.query().eq("dept_id",info.getDeptId()).orderByAsc("create_time").list().get(0).getId() +"");
+
         }
         dayworkItemList.forEach(l -> {
             if (l.getStatus().equals("4")) {

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

@@ -155,7 +155,7 @@ public class BizDayworkItem extends BaseEntity
 
     /** 周转区 */
     private String turnoverArea;
-
+    private String turnoverId;
     /** 周转类型 */
     private String turnoverType;
 
@@ -206,7 +206,7 @@ public class BizDayworkItem extends BaseEntity
 
 //    private Integer productionNum;
 
-    private Long placeId;
+    private String placeId;
 
     private String place;
 

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

@@ -71,13 +71,13 @@ public class BizQuickDayworkNextInfo extends BaseEntity
     /** 周转区 */
     @ApiModelProperty(value = "周转区")
     private String turnoverArea;
-
+    private String turnoverId;
     /** 周转类型 */
     @ApiModelProperty(value = "周转类型")
     private String turnoverType;
 
     @Excel(name = "摆放位置id turnover表id")
-    private Long placeId;
+    private String placeId;
 
     @Excel(name = "摆放位置")
     private String place;