字段

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java

@@ -126,6 +126,7 @@ public class BasicdataGoodsAreaController extends BladeController {
 		if (Objects.isNull(basicdataWarehouseEntity)){
 			return R.fail("无选择仓库,无法新增");
 		}
+		basicdataGoodsAreaEntity.setEnableStatus(1);
 		basicdataGoodsAreaEntity.setWarehouseId(basicdataWarehouseEntity.getId());
 		return R.status(basicdataGoodsAreaService.save(basicdataGoodsAreaEntity));
 	}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataTeamGroupMapper.xml

@@ -47,7 +47,7 @@
             lbtg.group_name
         FROM
             logpm_warehouse_warehouse AS lww
-            INNER JOIN logpm_basicdata_team_group AS lbtg ON lww.id = lbtg.belong_to
+            INNER JOIN logpm_basicdata_team_group AS lbtg ON lww.id = lbtg.warehouse_id
             <where>
                 <if test="deptId != null and deptId != '' ">
                     lww.department = #{deptId}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -1260,6 +1260,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			reservationEntity.setReservationDate(date);
 //			-----------------------预约信息完善----------------------------
 			reservationEntity.setReservationCode(Func.random(11,RandomType.INT));
+//			reservationEntity.setDeliveryWay();
 			reservationEntity.setDeliveryType(DistributionTypeConstant.shangpei.getValue());
 			reservationEntity.setStockupStatus(ReservationStockupStatusConstant.daibeihuo.getValue());
 			reservationEntity.setPeriodOfTime(ServiceConstant.RESERVATION_PERIOED_TIME_DAY);