diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java index a82947973..10e5a2616 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataGoodsAllocationEntity.java @@ -102,4 +102,15 @@ public class BasicdataGoodsAllocationEntity extends TenantEntity { @ApiModelProperty(value = "层编码") private String storeyNum; + /** + * 层编码 + */ + @ApiModelProperty(value = "二维码") + private String qrCode; + /** + * 层编码 + */ + @ApiModelProperty(value = "二维码路径") + private String qrCodeUrl; + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAllocationVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAllocationVO.java index 9e501ba05..0929d7742 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAllocationVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAllocationVO.java @@ -32,4 +32,11 @@ import lombok.EqualsAndHashCode; public class BasicdataGoodsAllocationVO extends BasicdataGoodsAllocationEntity { private static final long serialVersionUID = 1L; + //仓库名称 + private String warehouseName; + //货区名称 + private String goodsAreaName; + //货架名称 + private String goodsShelfName; + } diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java new file mode 100644 index 000000000..0fd7c4f31 --- /dev/null +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataNodeVO.java @@ -0,0 +1,23 @@ +package com.logpm.basicdata.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.List; + +@Data +public class BasicdataNodeVO { + + @ApiModelProperty(value = "仓库名称") + private String label; + + @ApiModelProperty(value = "仓库ID") + private String value; + + @ApiModelProperty(value = "是否继续加载") + private Boolean leaf ; + + @ApiModelProperty(value = "仓库货区") + List children; +} diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java index 4836d46bb..004a356f6 100644 --- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java +++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataWarehouseVO.java @@ -35,17 +35,6 @@ import java.util.List; public class BasicdataWarehouseVO extends BasicdataWarehouseEntity { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "仓库名称") - private String label; - - @ApiModelProperty(value = "仓库ID") - private String value; - - @ApiModelProperty(value = "是否继续加载") - private Boolean leaf ; - - @ApiModelProperty(value = "仓库货区") - List children; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java index bac88794c..3c2618c33 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java @@ -16,10 +16,12 @@ */ package com.logpm.basicdata.controller; +import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; import com.logpm.basicdata.service.IBasicdataGoodsAllocationService; import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -56,7 +58,7 @@ import javax.servlet.http.HttpServletResponse; @Api(value = "货位", tags = "货位接口") public class BasicdataGoodsAllocationController extends BladeController { - private final IBasicdataGoodsAllocationService BasicdataGoodsAllocationService; + private final IBasicdataGoodsAllocationService basicdataGoodsAllocationService; /** * 货位 详情 @@ -65,7 +67,7 @@ public class BasicdataGoodsAllocationController extends BladeController { @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入BasicdataGoodsAllocation") public R detail(BasicdataGoodsAllocationEntity BasicdataGoodsAllocation) { - BasicdataGoodsAllocationEntity detail = BasicdataGoodsAllocationService.getOne(Condition.getQueryWrapper(BasicdataGoodsAllocation)); + BasicdataGoodsAllocationEntity detail = basicdataGoodsAllocationService.getOne(Condition.getQueryWrapper(BasicdataGoodsAllocation)); return R.data(detail); } /** @@ -74,8 +76,10 @@ public class BasicdataGoodsAllocationController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入BasicdataGoodsAllocation") - public R> list(@ApiIgnore @RequestParam Map BasicdataGoodsAllocation, Query query) { - IPage pages = BasicdataGoodsAllocationService.page(Condition.getPage(query), Condition.getQueryWrapper(BasicdataGoodsAllocation, BasicdataGoodsAllocationEntity.class)); + public R> list(@ApiIgnore @RequestParam Map basicdataGoodsAllocation, Query query) { + + IPage pages = basicdataGoodsAllocationService.selectGoodsAllocationList(query,basicdataGoodsAllocation); +// IPage pages = basicdataGoodsAllocationService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsAllocation, BasicdataGoodsAllocationEntity.class)); return R.data(pages); } @@ -85,8 +89,8 @@ public class BasicdataGoodsAllocationController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "分页", notes = "传入BasicdataGoodsAllocation") - public R> page(BasicdataGoodsAllocationVO BasicdataGoodsAllocation, Query query) { - IPage pages = BasicdataGoodsAllocationService.selectBasicdataGoodsAllocationPage(Condition.getPage(query), BasicdataGoodsAllocation); + public R> page(BasicdataGoodsAllocationVO basicdataGoodsAllocation, Query query) { + IPage pages = basicdataGoodsAllocationService.selectBasicdataGoodsAllocationPage(Condition.getPage(query), basicdataGoodsAllocation); return R.data(pages); } @@ -96,8 +100,8 @@ public class BasicdataGoodsAllocationController extends BladeController { @PostMapping("/save") @ApiOperationSupport(order = 4) @ApiOperation(value = "新增", notes = "传入BasicdataGoodsAllocation") - public R save(@Valid @RequestBody BasicdataGoodsAllocationEntity BasicdataGoodsAllocation) { - return R.status(BasicdataGoodsAllocationService.save(BasicdataGoodsAllocation)); + public R save(@Valid @RequestBody BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) { + return R.status(basicdataGoodsAllocationService.insertGoodsAllocation(basicdataGoodsAllocationDto)); } /** @@ -107,7 +111,7 @@ public class BasicdataGoodsAllocationController extends BladeController { @ApiOperationSupport(order = 5) @ApiOperation(value = "修改", notes = "传入BasicdataGoodsAllocation") public R update(@Valid @RequestBody BasicdataGoodsAllocationEntity BasicdataGoodsAllocation) { - return R.status(BasicdataGoodsAllocationService.updateById(BasicdataGoodsAllocation)); + return R.status(basicdataGoodsAllocationService.updateById(BasicdataGoodsAllocation)); } /** @@ -117,7 +121,7 @@ public class BasicdataGoodsAllocationController extends BladeController { @ApiOperationSupport(order = 6) @ApiOperation(value = "新增或修改", notes = "传入BasicdataGoodsAllocation") public R submit(@Valid @RequestBody BasicdataGoodsAllocationEntity BasicdataGoodsAllocation) { - return R.status(BasicdataGoodsAllocationService.saveOrUpdate(BasicdataGoodsAllocation)); + return R.status(basicdataGoodsAllocationService.saveOrUpdate(BasicdataGoodsAllocation)); } /** @@ -127,7 +131,7 @@ public class BasicdataGoodsAllocationController extends BladeController { @ApiOperationSupport(order = 7) @ApiOperation(value = "逻辑删除", notes = "传入ids") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(BasicdataGoodsAllocationService.deleteLogic(Func.toLongList(ids))); + return R.status(basicdataGoodsAllocationService.deleteLogic(Func.toLongList(ids))); } @@ -143,8 +147,19 @@ public class BasicdataGoodsAllocationController extends BladeController { // queryWrapper.lambda().eq(BasicdataGoodsAllocation::getTenantId, bladeUser.getTenantId()); //} queryWrapper.lambda().eq(BasicdataGoodsAllocationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = BasicdataGoodsAllocationService.exportBasicdataGoodsAllocation(queryWrapper); + List list = basicdataGoodsAllocationService.exportBasicdataGoodsAllocation(queryWrapper); ExcelUtil.export(response, "货位数据" + DateUtil.time(), "货位数据表", list, BasicdataGoodsAllocationExcel.class); } + /** + * 货位 分页 + */ + @GetMapping("/getNode") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "仓库、货区、货架信息列表", notes = "传入BasicdataGoodsAllocation") + public R> getNode() { + List pages = basicdataGoodsAllocationService.getNode(); + return R.data(pages); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index 5064a425f..5eb426214 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -20,6 +20,7 @@ import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -171,8 +172,8 @@ public class BasicdataGoodsAreaController extends BladeController { @GetMapping("/goodsNode") @ApiOperationSupport(order = 2) @ApiOperation(value = "货区列表", notes = "传入仓库Id") - public R> getGoodsAreaList() { - List list = basicdataGoodsAreaService.getNodeList(); + public R> getGoodsAreaList() { + List list = basicdataGoodsAreaService.getNodeList(); return R.data(list); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java index 17d8c41cd..cd5c6e4a8 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java @@ -80,7 +80,6 @@ public class BasicdataGoodsShelfController extends BladeController { public R> list(@ApiIgnore @RequestParam Map basicdataGoodsShelf, Query query) { IPage page = Condition.getPage(query); IPage pages = basicdataGoodsShelfService.getGoodsShelfList(page,basicdataGoodsShelf); -// IPage pages = basicdataGoodsShelfService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataGoodsShelf, BasicdataGoodsShelfEntity.class)); return R.data(pages); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java index 4af2f1926..eb6443b4c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/dto/BasicdataGoodsAllocationDTO.java @@ -20,6 +20,8 @@ import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** * 货位 数据传输对象实体类 * @@ -31,4 +33,6 @@ import lombok.EqualsAndHashCode; public class BasicdataGoodsAllocationDTO extends BasicdataGoodsAllocationEntity { private static final long serialVersionUID = 1L; + private List nodeInfo; + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java index 3c46d109f..557706adb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.java @@ -22,8 +22,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * 货位 Mapper 接口 @@ -51,4 +53,10 @@ public interface BasicdataGoodsAllocationMapper extends BaseMapper exportBasicdataGoodsAllocation(@Param("ew") Wrapper queryWrapper); + List selectSecondNode(@Param("warehouseId")String warehouseId); + + List selectThirdNode(@Param("warehouseId")String warehouseId,@Param("areaId") String areaId); + + IPage selectGoodsAllocationList(IPage page,@Param("po") Map basicdataGoodsAllocation); + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index 5177ab89a..db2180c8c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -37,5 +37,77 @@ + + + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java index 47b562cd9..b76eba2e0 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -57,7 +58,7 @@ public interface BasicdataGoodsAreaMapper extends BaseMapper getGoodsAreaList(@Param("po")Map basicdataGoodsArea); - List selectFirstNode(); + List selectFirstNode(); - List selectSecondNode(String value); + List selectSecondNode(String value); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml index 17f7f05a0..d45e0f095 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml @@ -78,14 +78,14 @@ - SELECT id AS value, name AS label FROM logpm_warehouse_warehouse - SELECT id AS value, headline AS label, diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml index 499511b22..22b5c7f2e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsShelfMapper.xml @@ -82,7 +82,6 @@ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java index 012d178dc..4ab3fe7d2 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataWarehouseMapper.java @@ -58,16 +58,7 @@ public interface BasicdataWarehouseMapper extends BaseMapper getWarehouseList(); -<<<<<<< HEAD BasicdataDTO selectIsHaveResource(String id); -======= - /** - * 获取字典 - * - * @return - */ - List selectWarehouseWarehouseDictionary(); ->>>>>>> origin/dev } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java index 05232b77c..adfe1c10e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java @@ -18,11 +18,16 @@ package com.logpm.basicdata.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; + import java.util.List; +import java.util.Map; /** * 货位 服务类 @@ -49,4 +54,26 @@ public interface IBasicdataGoodsAllocationService extends BaseService exportBasicdataGoodsAllocation(Wrapper queryWrapper); + /** + * 仓库、货区、货架信息列表 + * @return + */ + List getNode(); + + /** + * 新增货位 + * @param basicdataGoodsAllocationDto + * @return + */ + boolean insertGoodsAllocation( BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto); + + /** + * 查询列表信息，封装VO + * @param query + * @param basicdataGoodsAllocation + * @return + */ + IPage selectGoodsAllocationList(Query query, Map basicdataGoodsAllocation); + + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java index 7eb0d77c9..a10ed293e 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAreaService.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; @@ -69,7 +70,11 @@ public interface IBasicdataGoodsAreaService extends BaseService getGoodsAreaList(Map basicdataGoodsArea); - List getNodeList(); + /** + * 仓库、货区信息列表 + * @return + */ + List getNodeList(); /** * 删除货区 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java index 908079b35..ef9170c47 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java @@ -16,16 +16,31 @@ */ package com.logpm.basicdata.service.impl; +import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; import com.logpm.basicdata.mapper.BasicdataGoodsAllocationMapper; +import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; import com.logpm.basicdata.service.IBasicdataGoodsAllocationService; import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; +import com.logpm.basicdata.vo.BasicdataWarehouseVO; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.Func; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; + +import java.util.Date; import java.util.List; +import java.util.Map; /** * 货位 服务实现类 @@ -34,8 +49,13 @@ import java.util.List; * @since 2023-05-19 */ @Service +@AllArgsConstructor public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl implements IBasicdataGoodsAllocationService { + private BasicdataGoodsAllocationMapper goodsAllocationMapper; + + private BasicdataGoodsAreaMapper goodsAreaMapper; + @Override public IPage selectBasicdataGoodsAllocationPage(IPage page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) { return page.setRecords(baseMapper.selectBasicdataGoodsAllocationPage(page, BasicdataGoodsAllocation)); @@ -51,4 +71,86 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl getNode() { + //查询一级仓库节点信息 + List basicdataWarehouseVOList = goodsAreaMapper.selectFirstNode(); + //遍历仓库节点查询货区节点信息 + for (BasicdataNodeVO basicdataNodeVO : basicdataWarehouseVOList) { + List goodeAreaNodes = goodsAllocationMapper.selectSecondNode(basicdataNodeVO.getValue()); + //判断仓库下是否存在货区节点，存在则添加，不存在则设置没有下级节点 + if (!Func.isEmpty(goodeAreaNodes)){ + basicdataNodeVO.setChildren(goodeAreaNodes); + for (BasicdataNodeVO goodeAreaNode : goodeAreaNodes) { + //遍历货区节点信息，查询货区对应货架节点 + List goodsShelfNode = goodsAllocationMapper.selectThirdNode(basicdataNodeVO.getValue(),goodeAreaNode.getValue()); + if (!Func.isEmpty(goodeAreaNode)){ + goodeAreaNode.setChildren(goodsShelfNode); + }else { + goodeAreaNode.setLeaf(true); + } + } + }else { + basicdataNodeVO.setLeaf(true); + } + } + + return basicdataWarehouseVOList; + } + + @Override + public boolean insertGoodsAllocation( BasicdataGoodsAllocationDTO basicdataGoodsAllocationDto) { + BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = new BasicdataGoodsAllocationEntity(); + List nodeInfo = basicdataGoodsAllocationDto.getNodeInfo(); + if (Func.isEmpty(nodeInfo)){ + log.error("参数不合法：{}"+nodeInfo); + return false; + }else { + basicdataGoodsAllocationEntity.setWarehouseId((String) nodeInfo.get(0)); + basicdataGoodsAllocationEntity.setGoodsAreaId((String) nodeInfo.get(1)); + basicdataGoodsAllocationEntity.setGoodsShelfId((String) nodeInfo.get(2)); + } + BeanUtils.copyProperties(basicdataGoodsAllocationDto,basicdataGoodsAllocationEntity); + BladeUser user = AuthUtil.getUser(); + Long userId = user.getUserId(); + basicdataGoodsAllocationEntity.setEnableStatus("1"); + basicdataGoodsAllocationEntity.setStatus(1); + basicdataGoodsAllocationEntity.setIsDeleted(0); + basicdataGoodsAllocationEntity.setCreateDept(Long.valueOf(user.getDeptId())); + basicdataGoodsAllocationEntity.setAllocationStatuc("1"); + basicdataGoodsAllocationEntity.setCreateTime(new Date()); + basicdataGoodsAllocationEntity.setCreateUser(userId); + basicdataGoodsAllocationEntity.setUpdateTime(new Date()); + basicdataGoodsAllocationEntity.setUpdateUser(userId); + basicdataGoodsAllocationEntity.setTenantId(user.getTenantId()); + + boolean result = SqlHelper.retBool(goodsAllocationMapper.insert(basicdataGoodsAllocationEntity)); + + + + return result; + } + + @Override + public IPage selectGoodsAllocationList(Query query, Map basicdataGoodsAllocation) { + IPage page = Condition.getPage(query); + String nodeInfo = (String) basicdataGoodsAllocation.get("nodeInfo[]"); + if (!Func.isBlank(nodeInfo)){ + String[] split = nodeInfo.split(","); + if (split.length==1){ + basicdataGoodsAllocation.put("warehouseId",split[0]); + }else if (split.length==2){ + basicdataGoodsAllocation.put("warehouseId",split[0]); + basicdataGoodsAllocation.put("goodsAreaId",split[1]); + }else if (split.length==3){ + basicdataGoodsAllocation.put("warehouseId",split[0]); + basicdataGoodsAllocation.put("goodsAreaId",split[1]); + basicdataGoodsAllocation.put("goodsShelfId",split[2]); + } + } + IPage goodsAllocationVOIPage = goodsAllocationMapper.selectGoodsAllocationList(page,basicdataGoodsAllocation); + return goodsAllocationVOIPage; + + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index c9973aefd..4b2f5aee6 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -22,6 +22,7 @@ import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; import com.logpm.basicdata.mapper.BasicdataGoodsAreaMapper; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; +import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import lombok.AllArgsConstructor; import org.springblade.core.tool.utils.Func; @@ -30,6 +31,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.Collections; import java.util.List; import java.util.Map; @@ -76,22 +78,22 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl getNodeList() { + public List getNodeList() { //查出所有仓库信息 - List basicdataWarehouseVOList= basicdataGoodsAreaMapper.selectFirstNode(); + List basicdataWarehouseVOList= basicdataGoodsAreaMapper.selectFirstNode(); //查出所有货区信息 - for (BasicdataWarehouseVO basicdataWarehouseVO : basicdataWarehouseVOList) { - List basicdataGoodsAreaVOList = basicdataGoodsAreaMapper.selectSecondNode(basicdataWarehouseVO.getValue()); + for (BasicdataNodeVO basicdataWarehouseVO : basicdataWarehouseVOList) { + List basicdataGoodsAreaVOList = basicdataGoodsAreaMapper.selectSecondNode(basicdataWarehouseVO.getValue()); if (!Func.isEmpty(basicdataGoodsAreaVOList)){ basicdataWarehouseVO.setChildren(basicdataGoodsAreaVOList); }else { basicdataWarehouseVO.setLeaf(true); } } + return basicdataWarehouseVOList; } -<<<<<<< HEAD @Override public boolean removeGoodsArea(List ids) { boolean result = false; @@ -101,6 +103,4 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl>>>>>> origin/dev } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index d72febcd1..4bbe80dd7 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -73,7 +73,6 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl getGoodsShelfList(IPage page, Map basicdataGoodsShelf) { IPage basicdataGoodsShelfVOIPage=basicdataGoodsShelfMapper.getGoodsShelfList(page,basicdataGoodsShelf); - return basicdataGoodsShelfVOIPage; } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java index 0603398b6..9489bf50c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java @@ -25,10 +25,7 @@ import com.logpm.basicdata.service.IBasicdataWarehouseService; import com.logpm.basicdata.vo.BasicdataGoodsShelfVO; import com.logpm.basicdata.vo.BasicdataWarehouseVO; import lombok.AllArgsConstructor; -<<<<<<< HEAD import org.springblade.core.tool.utils.Func; -======= ->>>>>>> origin/dev import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -49,11 +46,8 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl>>>>>> origin/dev @Override public IPage selectWarehouseWarehousePage(IPage page, BasicdataWarehouseVO warehouseWarehouse) { return page.setRecords(baseMapper.selectWarehouseWarehousePage(page, warehouseWarehouse)); @@ -83,7 +77,6 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl ids) { //删除仓库应该针对仓库锁关联的信息都进行逻辑删除 //多个id数据格式1658283633661894657,1658317411591540738,1659120672275914753 @@ -98,10 +91,6 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl selectWarehouseWarehouseDictionary() { - return baseMapper.selectWarehouseWarehouseDictionary(); ->>>>>>> origin/dev } } diff --git a/doc/dpm/物流租户系统.pdma.json b/doc/dpm/物流租户系统.pdma.json index 0dc5b4073..5566c9786 100644 --- a/doc/dpm/物流租户系统.pdma.json +++ b/doc/dpm/物流租户系统.pdma.json @@ -4,7 +4,7 @@ "avatar": "", "version": "4.5.1", "createdTime": "2023-3-27 13:32:56", - "updatedTime": "2023-5-16 10:58:05", + "updatedTime": "2023-5-25 15:20:06", "dbConns": [], "profile": { "default": { @@ -13093,299 +13093,8 @@ "uiHint": null }, { - "defKey": "goods_shelf_id", - "defName": "货架ID", - "comment": "", - "type": "VARCHAR", - "len": 32, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "C83CC1C5-AFE0-4D7D-B4BB-9DA34C499B4F", - "uiHint": null - } - ], - "correlations": [], - "indexes": [] - }, - { - "id": "EAE3449D-3027-4D45-A38A-2B2A906B8FF6", - "env": { - "base": { - "nameSpace": "", - "codeRoot": "" - } - }, - "defKey": "logpm_warehouse_tray", - "defName": "托盘", - "comment": "", - "properties": { - "partitioned by": "(date string)", - "row format delimited": "", - "fields terminated by ','": "", - "collection items terminated by '-'": "", - "map keys terminated by ':'": "", - "store as textfile;": "" - }, - "nameTemplate": "{defKey}[{defName}]", - "notes": {}, - "headers": [ - { - "refKey": "hideInGraph", - "hideInGraph": true - }, - { - "refKey": "defKey", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "defName", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "primaryKey", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "notNull", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "autoIncrement", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "domain", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "type", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "len", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "scale", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "comment", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "refDict", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "defaultValue", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "isStandard", - "freeze": false, - "hideInGraph": false - }, - { - "refKey": "uiHint", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "extProps", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr1", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr2", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr3", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr4", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr5", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr6", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr7", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr8", - "freeze": false, - "hideInGraph": true - }, - { - "refKey": "attr9", - "freeze": false, - "hideInGraph": true - } - ], - "fields": [ - { - "defKey": "tenant_id", - "defName": "租户号", - "comment": "", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "refDict": null, - "uiHint": null, - "id": "AC7BD94E-52B5-424D-8A10-6182CDA2BDD2" - }, - { - "defKey": "create_user", - "defName": "创建人", - "comment": "", - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "8EB7CAC9-3334-4632-880F-0E3126400B5E" - }, - { - "defKey": "create_time", - "defName": "创建时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "3CFED4B1-7946-4E4E-A5FD-6ADCCCD7F6F2" - }, - { - "defKey": "update_user", - "defName": "更新人", - "comment": "", - "domain": "16120F75-6AA7-4483-868D-F07F511BB081", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "1CEFEE6A-2AC9-47E1-ACED-EFBAA946046C" - }, - { - "defKey": "update_time", - "defName": "更新时间", - "comment": "", - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "type": "", - "len": "", - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": true, - "refDict": null, - "uiHint": null, - "id": "196C16CF-10AD-432B-90E9-D504103CDF09" - }, - { - "defKey": "status", - "defName": "状态", - "comment": "", - "type": "INT", - "len": 2, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "21BC5640-1F57-4E83-B1CF-73ECAB47A343", - "uiHint": null - }, - { - "defKey": "is_deleted", - "defName": "是否已删除", - "comment": "", - "type": "INT", - "len": 2, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "EC5CD4E2-21D3-41DE-8125-3839AA2BCB13", - "uiHint": null - }, - { - "defKey": "create_dept", - "defName": "创建部门", + "defKey": "warehouse_id", + "defName": "仓库编号", "comment": "", "type": "", "len": "", @@ -13395,36 +13104,17 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "B01DD464-53F9-40D2-AEC9-6B8DB703DFC4", - "uiHint": null - }, - { - "defKey": "id", - "defName": "主键", - "comment": "", - "type": "INT", - "len": 20, - "scale": "", - "primaryKey": true, - "notNull": true, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, - "domain": null, - "id": "F4C083F7-5A81-4C0A-A6AF-F4BC488C541E", - "uiHint": null + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "054600A6-AF25-4EF7-B0A7-4F05A443C998" }, { - "defKey": "reserve1", - "defName": "预留1", + "defKey": "goods_shelf_id", + "defName": "货架编号", "comment": "", - "type": "", - "len": "", + "type": "VARCHAR", + "len": 32, "scale": "", "primaryKey": false, "notNull": false, @@ -13433,13 +13123,13 @@ "hideInGraph": false, "refDict": null, "extProps": {}, - "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "1401721C-F291-44B0-85E3-7BD1719E182A", + "domain": null, + "id": "C83CC1C5-AFE0-4D7D-B4BB-9DA34C499B4F", "uiHint": null }, { - "defKey": "reserve2", - "defName": "预留2", + "defKey": "row_num", + "defName": "列数", "comment": "", "type": "", "len": "", @@ -13449,15 +13139,14 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "C8E0240B-9BC3-419A-B645-2E5BEA2C9B15", - "uiHint": null + "id": "20C59AAA-E725-43D8-AFC6-6B0218C903CA" }, { - "defKey": "reserve3", - "defName": "预留3", + "defKey": "storey_num", + "defName": "层数", "comment": "", "type": "", "len": "", @@ -13467,15 +13156,14 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "C0882161-D596-41EE-B496-C6C371F53697", - "uiHint": null + "id": "22643742-8ED6-4114-A2CC-E1F0B4FD235C" }, { - "defKey": "reserve4", - "defName": "预留4", + "defKey": "enable_status", + "defName": "启用状态", "comment": "", "type": "", "len": "", @@ -13485,16 +13173,15 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "E02127E4-BEF0-4601-9832-8C8F8CBD52E5", - "uiHint": null + "id": "DC5DAA00-50EA-4D80-B579-505CD0EFCB5C" }, { - "defKey": "reserve5", - "defName": "预留5", - "comment": "", + "defKey": "allocation_status", + "defName": "货位状态", + "comment": "货位状态;1-空闲；2-托盘；3-货物", "type": "", "len": "", "scale": "", @@ -13503,33 +13190,14 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "F5565A7A-56F5-4991-8C28-4C1867805A0D", - "uiHint": null - }, - { - "defKey": "pallet_code", - "defName": "托盘码", - "comment": "", - "type": "VARCHAR", - "len": 100, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "F6A948C2-BCEB-4691-986C-6A8D3420D58C", - "uiHint": null + "id": "6EDFC3D6-7D8B-4345-B978-9DBD76E795B5" }, { - "defKey": "quantity_support", - "defName": "在托数量", + "defKey": "qr_code", + "defName": "二维码", "comment": "", "type": "", "len": "", @@ -13539,51 +13207,14 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "5D12ED3F-5DE7-4F3E-AC79-9840BA1991DD", - "uiHint": null - }, - { - "defKey": "warehouse_id", - "defName": "所属仓库", - "comment": "", - "type": "VARCHAR", - "len": 32, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "73C6D9EA-31B2-4C3D-8FE1-ED44F8CE6720", - "uiHint": null - }, - { - "defKey": "current_warehouse", - "defName": "当前仓库", - "comment": "", - "type": "VARCHAR", - "len": 32, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, - "domain": null, - "id": "943E416F-3A00-4FDC-9D07-977A357B8EE5", - "uiHint": null + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "5B823D49-ECBA-4A88-BAEE-E8C978ADC88C" }, { - "defKey": "batching_time", - "defName": "打托时间", + "defKey": "qr_code_url", + "defName": "二维码图片", "comment": "", "type": "", "len": "", @@ -13593,34 +13224,15 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, - "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC", - "id": "0DF3F6A9-B92F-42F7-9313-3DF93D7A2A7D", - "uiHint": null + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "B25ED2D6-F230-4CB5-988F-04D01935DC14" }, { - "defKey": "qr_code", - "defName": "二维码", + "defKey": "goods_area_id", + "defName": "货区编号", "comment": "", - "type": "VARCHAR", - "len": 100, - "scale": "", - "primaryKey": false, - "notNull": false, - "autoIncrement": false, - "defaultValue": "", - "hideInGraph": false, - "refDict": null, - "extProps": {}, - "domain": null, - "id": "61D0F4FB-B92D-4B8F-99E2-0051DF77F972", - "uiHint": null - }, - { - "defKey": "type", - "defName": "类型", - "comment": "木托 铁托 台面托", "type": "", "len": "", "scale": "", @@ -13629,26 +13241,25 @@ "autoIncrement": false, "defaultValue": "", "hideInGraph": false, - "refDict": null, + "refDict": "", "extProps": {}, - "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "3F552CEE-A461-441A-B994-C3DCA98BD222", - "uiHint": null + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "AABD8263-DBF7-4E70-A7D8-F5BECD200A7A" } ], "correlations": [], "indexes": [] }, { - "id": "329F6BAF-B3C5-4142-86E2-E9962E8C2860", + "id": "EAE3449D-3027-4D45-A38A-2B2A906B8FF6", "env": { "base": { "nameSpace": "", "codeRoot": "" } }, - "defKey": "logpm_warehouse_storage_area", - "defName": "备货区", + "defKey": "logpm_warehouse_tray", + "defName": "托盘", "comment": "", "properties": { "partitioned by": "(date string)", @@ -13802,7 +13413,7 @@ "domain": "16120F75-6AA7-4483-868D-F07F511BB081", "refDict": null, "uiHint": null, - "id": "2A98840D-4A11-4BF7-89F6-72987097F894" + "id": "AC7BD94E-52B5-424D-8A10-6182CDA2BDD2" }, { "defKey": "create_user", @@ -13819,7 +13430,7 @@ "hideInGraph": true, "refDict": null, "uiHint": null, - "id": "D37F7651-5E23-4B71-9AAE-748FE04CD78E" + "id": "8EB7CAC9-3334-4632-880F-0E3126400B5E" }, { "defKey": "create_time", @@ -13836,7 +13447,7 @@ "hideInGraph": true, "refDict": null, "uiHint": null, - "id": "6636FB74-7A17-4145-986A-01F1557D6140" + "id": "3CFED4B1-7946-4E4E-A5FD-6ADCCCD7F6F2" }, { "defKey": "update_user", @@ -13853,7 +13464,7 @@ "hideInGraph": true, "refDict": null, "uiHint": null, - "id": "0109CD65-DCCD-4DC4-A8A3-4D8C2635EB02" + "id": "1CEFEE6A-2AC9-47E1-ACED-EFBAA946046C" }, { "defKey": "update_time", @@ -13870,7 +13481,7 @@ "hideInGraph": true, "refDict": null, "uiHint": null, - "id": "C5C9CCD3-37E9-4E28-900D-03B2811807D9" + "id": "196C16CF-10AD-432B-90E9-D504103CDF09" }, { "defKey": "status", @@ -13887,7 +13498,7 @@ "refDict": null, "extProps": {}, "domain": null, - "id": "6BF389DD-C484-404B-B4F5-CF1F2C774ED3", + "id": "21BC5640-1F57-4E83-B1CF-73ECAB47A343", "uiHint": null }, { @@ -13905,7 +13516,7 @@ "refDict": null, "extProps": {}, "domain": null, - "id": "44CC052E-482D-4861-A365-BEE439CF41C6", + "id": "EC5CD4E2-21D3-41DE-8125-3839AA2BCB13", "uiHint": null }, { @@ -13923,7 +13534,7 @@ "refDict": null, "extProps": {}, "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", - "id": "89FC2287-B3A9-46C3-99C1-A30BFCAEEDFD", + "id": "B01DD464-53F9-40D2-AEC9-6B8DB703DFC4", "uiHint": null }, { @@ -13941,7 +13552,7 @@ "refDict": null, "extProps": {}, "domain": null, - "id": "A6891D6D-F73A-4570-9E40-44B34DD2D99C", + "id": "F4C083F7-5A81-4C0A-A6AF-F4BC488C541E", "uiHint": null }, { @@ -13959,7 +13570,7 @@ "refDict": null, "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "E69811D2-F968-4E43-A52F-7BDDD2FAE14F", + "id": "1401721C-F291-44B0-85E3-7BD1719E182A", "uiHint": null }, { @@ -13977,7 +13588,7 @@ "refDict": null, "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "1AB2C427-6784-42FC-B768-C7741BEC4A89", + "id": "C8E0240B-9BC3-419A-B645-2E5BEA2C9B15", "uiHint": null }, { @@ -13995,7 +13606,7 @@ "refDict": null, "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "98958686-BBC1-45B3-9C29-7AD5EA8E389A", + "id": "C0882161-D596-41EE-B496-C6C371F53697", "uiHint": null }, { @@ -14013,7 +13624,7 @@ "refDict": null, "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "0BD052B1-1C56-4943-ADA5-6F3228435D03", + "id": "E02127E4-BEF0-4601-9832-8C8F8CBD52E5", "uiHint": null }, { @@ -14031,15 +13642,15 @@ "refDict": null, "extProps": {}, "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", - "id": "7EB74CEB-4AC2-4CFD-9F8E-E47B6705E874", + "id": "F5565A7A-56F5-4991-8C28-4C1867805A0D", "uiHint": null }, { - "defKey": "warehouse_id", - "defName": "仓库ID", + "defKey": "pallet_code", + "defName": "托盘码", "comment": "", "type": "VARCHAR", - "len": 32, + "len": 100, "scale": "", "primaryKey": false, "notNull": false, @@ -14049,12 +13660,12 @@ "refDict": null, "extProps": {}, "domain": null, - "id": "6A82B481-F1AB-40F6-BFE6-3D8134867A96", + "id": "F6A948C2-BCEB-4691-986C-6A8D3420D58C", "uiHint": null }, { - "defKey": "tray_id", - "defName": "托盘ID", + "defKey": "warehouse_id", + "defName": "仓库编号", "comment": "", "type": "VARCHAR", "len": 32, @@ -14067,15 +13678,49 @@ "refDict": null, "extProps": {}, "domain": null, - "id": "4BE7A43F-8023-445C-8A63-AD3BFCB516E4", + "id": "73C6D9EA-31B2-4C3D-8FE1-ED44F8CE6720", "uiHint": null }, { - "defKey": "order_form", - "defName": "订单ID", + "defKey": "tray_status", + "defName": "托盘状态", + "comment": "1-空闲；2-货物；3-损毁；4-流通；5", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "42E92BD2-2290-464A-84F4-FBCE4DB5DAE5" + }, + { + "defKey": "qr_code_url", + "defName": "二维码图片", + "comment": "", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": "", + "extProps": {}, + "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573", + "id": "5906E73A-3B6E-4EBA-99FF-FA005ABA7CA0" + }, + { + "defKey": "qr_code", + "defName": "二维码", "comment": "", "type": "VARCHAR", - "len": 32, + "len": 100, "scale": "", "primaryKey": false, "notNull": false, @@ -14085,7 +13730,25 @@ "refDict": null, "extProps": {}, "domain": null, - "id": "C7635EF2-D4D7-4202-9783-800E63A2AC48", + "id": "61D0F4FB-B92D-4B8F-99E2-0051DF77F972", + "uiHint": null + }, + { + "defKey": "type", + "defName": "类型", + "comment": "木托 铁托 台面托", + "type": "", + "len": "", + "scale": "", + "primaryKey": false, + "notNull": false, + "autoIncrement": false, + "defaultValue": "", + "hideInGraph": false, + "refDict": null, + "extProps": {}, + "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E", + "id": "3F552CEE-A461-441A-B994-C3DCA98BD222", "uiHint": null } ], @@ -30783,8 +30446,7 @@ "149EAB91-7629-4F13-86D6-0243068AB876", "61BF4F4D-9FA8-4A42-934C-F2E203F4F1FD", "AE0BA6A8-2945-47D8-BB2F-EB77B91E9984", - "EAE3449D-3027-4D45-A38A-2B2A906B8FF6", - "329F6BAF-B3C5-4142-86E2-E9962E8C2860" + "EAE3449D-3027-4D45-A38A-2B2A906B8FF6" ], "refViews": [], "refDiagrams": [], @@ -31323,4 +30985,4 @@ } ], "dbConn": [] -} +} \ No newline at end of file