diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java index 89eba6b1..379a4b1a 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/InventoryController.java @@ -220,6 +220,7 @@ public class InventoryController extends BaseController { .itemId(item.getId()) .uniqNo(qrCodeContent.getUniqNo()) .materialNo(qrCodeContent.getMaterialNo()) + .materialDesc(qrCodeContent.getMaterialDesc()) .materialId(material.getId()) .batchNo(qrCodeContent.getBatchNo()) .serialNo(qrCodeContent.getSerialNo()) diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java index 84fa394e..27e4f94b 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/StructuralPackageOrderController.java @@ -112,9 +112,6 @@ public class StructuralPackageOrderController extends BaseController { @Resource private IUserSupplierService userSupplierService; - @Resource - private IWmsInventoryService inventoryService; - @Resource private IWmsStorageService storageService; @@ -337,15 +334,6 @@ public class StructuralPackageOrderController extends BaseController { return ApiResult.success(vo); } - /** - * 获取零件扫码记录 - * @param id 零件id - */ - @GetMapping("getScanRecord") - public ApiResult> getScanRecord(@Valid @RequestParam @NotNull Long id) { - return ApiResult.success(packageMaterialScanRecordRepository.findByTrayItemId(id)); - } - /** * 删除 * @param ids 要删除的id列表 @@ -858,4 +846,15 @@ public class StructuralPackageOrderController extends BaseController { public ApiResult> getTicketItems(@Valid @RequestParam @NotBlank String taskNo) { return ApiResult.success(inTaskItemService.getByNo(taskNo)); } + + /** + * 获取扫码记录 + * @param poNum 采购订单号 + * @param materialNo 物料编号 + */ + @GetMapping("getScanRecord") + public ApiResult> getScanRecord(@Valid @RequestParam @NotBlank String poNum + , @Valid @RequestParam @NotBlank String materialNo) { + return ApiResult.success(packageMaterialScanRecordRepository.findByPoNumAndMaterialNo(poNum, materialNo)); + } } \ No newline at end of file diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java index 899125e2..f03ba387 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/TransferCompanyController.java @@ -113,6 +113,7 @@ public class TransferCompanyController extends BaseController { .throwMessage("物料" + item.getMatnr() + "的申请数量超出库存限制"); WmsTransferCompanyItem data = Convert.convert(WmsTransferCompanyItem.class, item); data.setOrderId(order.getId()); + data.setLeft(data.getNum()); transferCompanyItemService.save(data); }); }); diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java index affc965a..ebf4bea9 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/InventoryCheckTaskScanRecord.java @@ -43,6 +43,11 @@ public class InventoryCheckTaskScanRecord { */ private String materialNo; + /** + * 物料描述 + */ + private String materialDesc; + /** * 批次号 */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java index 0f6b598d..0df5cb6e 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/pojo/document/PackageMaterialScanRecord.java @@ -26,6 +26,11 @@ public class PackageMaterialScanRecord { */ private String materialNo; + /** + * 采购订单号 + */ + private String poNum; + /** * 二维码内容 */ diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/PackageMaterialScanRecordRepository.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/PackageMaterialScanRecordRepository.java index eb816a9d..10f18d05 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/PackageMaterialScanRecordRepository.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/repository/PackageMaterialScanRecordRepository.java @@ -9,6 +9,5 @@ import java.util.List; @Repository public interface PackageMaterialScanRecordRepository extends MongoRepository { - List findByTrayItemId(Long trayItemId); - + List findByPoNumAndMaterialNo(String poNum, String materialNo); } \ No newline at end of file diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java index b93531a1..2c3c46da 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/dto/AllocationOrderDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.experimental.Accessors; import java.math.BigDecimal; +import java.util.Objects; @Data @Accessors(chain = true) @@ -136,6 +137,15 @@ public class AllocationOrderDTO{ */ private String ekgrp; + /** + * 转储数量 + */ + private BigDecimal num; + + public BigDecimal getNum() { + return Objects.isNull(num) ? sqsl2 : num; + } + @JsonIgnore private String key; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskVO.java index 8038e7bb..31edf339 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InTaskVO.java @@ -20,7 +20,12 @@ public class InTaskVO { private String orderNumber; /** - * 任务时间 + * 创建时间 + */ + private LocalDateTime createTime; + + /** + * 上架时间 */ private LocalDateTime updateTime; diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java index b8b714b9..ebb56144 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/InventoryCheckTaskItemMaterialVO.java @@ -58,4 +58,13 @@ public class InventoryCheckTaskItemMaterialVO { * 库存数量 */ private BigDecimal inventoryNum; + + /** + * 差异数量 + */ + private BigDecimal differenceNum; + + public BigDecimal getDifferenceNum() { + return this.inventoryNum.subtract(this.num); + } } diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java index dee75605..5fc188f5 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/TransferCompanyItemVO.java @@ -110,4 +110,9 @@ public class TransferCompanyItemVO { * 剩余数量 */ private BigDecimal left; + + /** + * 转储数量 + */ + private BigDecimal num; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java index f9ae7d7e..37b3c167 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsTransferCompanyItem.java @@ -125,6 +125,11 @@ public class WmsTransferCompanyItem implements Serializable { */ private String ekgrp; + /** + * 转储数量 + */ + private BigDecimal num; + /** * 剩余数量 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuButtonServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuButtonServiceImpl.java index 2a80a713..231b81d2 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuButtonServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuButtonServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nflg.wms.common.pojo.PageData; import com.nflg.wms.common.pojo.qo.EnableMenuQO; import com.nflg.wms.common.pojo.qo.MenuButtonAddQO; @@ -15,7 +16,6 @@ import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.MenuButton; import com.nflg.wms.repository.mapper.MenuButtonMapper; import com.nflg.wms.repository.service.IMenuButtonService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -37,6 +37,8 @@ public class MenuButtonServiceImpl extends ServiceImpl page = lambdaQuery() .eq(Objects.nonNull(request.getMenuId()), MenuButton::getMenuId, request.getMenuId()) .like(StrUtil.isNotBlank(request.getName()), MenuButton::getName, request.getName()) + .orderByAsc(MenuButton::getSort) + .orderByAsc(MenuButton::getId) .page(new Page<>(request.getPage(), request.getPageSize())); return PageUtil.convert(page, d -> Convert.convert(MenuButtonVO.class, d)); } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java index abbb2348..42c557a9 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/MenuServiceImpl.java @@ -69,7 +69,8 @@ public class MenuServiceImpl extends ServiceImpl implements IM if (StrUtil.isNotBlank(request.getName())) { queryWrapper.like(Menu::getName, request.getName()); } - queryWrapper.orderByDesc(Menu::getSort); + queryWrapper.orderByAsc(Menu::getSort); + queryWrapper.orderByAsc(Menu::getId); List list = baseMapper.selectList(queryWrapper); //找出非根节点 List roots = list.stream().filter(l -> Objects.equals(l.getParentId(), 0L)).collect(Collectors.toList()); @@ -225,7 +226,9 @@ public class MenuServiceImpl extends ServiceImpl implements IM IPage page = new Page<>(); page.setCurrent(request.getPage()); page.setSize(request.getPageSize()); - lambdaQuery().eq(Menu::getParentId, 0) + lambdaQuery() + .eq(Menu::getParentId, 0) + .orderByAsc(Menu::getSort) .orderByAsc(Menu::getId) .page(page); List datas = convert(page.getRecords()); @@ -252,7 +255,8 @@ public class MenuServiceImpl extends ServiceImpl implements IM private List getChildren(Long parentId) { List datas = convert(lambdaQuery().eq(Menu::getParentId, parentId) - .orderByDesc(Menu::getSort) + .orderByAsc(Menu::getSort) + .orderByAsc(Menu::getId) .list()); datas.forEach(d -> d.setChildren(getChildren(d.getId()))); return datas; @@ -268,6 +272,8 @@ public class MenuServiceImpl extends ServiceImpl implements IM List vos = menuButtonService.lambdaQuery() .eq(MenuButton::getMenuId, menu.getId()) .eq(MenuButton::getEnable, true) + .orderByAsc(MenuButton::getSort) + .orderByAsc(MenuButton::getId) .list(); menu.setChildren(vos.stream() .map(d -> new MenuAuthorizeVO().setType(2).setId(d.getId()).setKey("button-"+d.getId()).setName(d.getName()).setSelected(buttonIsSelected(roleId, d.getId())))