修改接口新增修改人

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/WmsAllocateOrderDetailController.java

@@ -103,7 +103,11 @@ public class WmsAllocateOrderDetailController extends BaseController {
                           @PathVariable Long[] aoDIds) {
         return toAjax(wmsAllocateOrderDetailService.deleteWithValidByIds(List.of(aoDIds), true));
     }
-
+    /**
+     * 根据主键删除调拨子
+     *
+     * @param aoDId 主键串
+     */
     @SaCheckPermission("system:allocateOrderDetail:remove")
     @Log(title = "调拨子", businessType = BusinessType.DELETE)
     @DeleteMapping("removeDetail/{aoDId}")
@@ -111,7 +115,11 @@ public class WmsAllocateOrderDetailController extends BaseController {
                           @PathVariable Long aoDId) {
         return toAjax(wmsAllocateOrderDetailService.deleteById(aoDId));
     }
-
+    /**
+     * 根据调拨单主键查询调拨单明细
+     *
+     * @param aoDId 主键串
+     */
     @GetMapping("selectAllocateDetails")
     public R<List<WmsAllocateOrderDetailVo>> selectAllocateDetails(Long aoDId){
         return R.ok(wmsAllocateOrderDetailService.selectAllocateDetails());

ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsInventoryServiceImpl.java

@@ -175,7 +175,8 @@ public class WmsInventoryServiceImpl implements IWmsInventoryService {
         MPJLambdaWrapper<WmsInventory> lqw = new MPJLambdaWrapper<>();
         lqw.selectAll(WmsInventory.class).select(BaseMaterialInfo::getMaterialCode)
                 .leftJoin(BaseMaterialInfo.class,BaseMaterialInfo::getMaterialId,WmsInventory::getMaterialId);
-        lqw.eq(WmsInventory::getLocationCode,bo.getLocationCode());
+        lqw.eq(WmsInventory::getLocationCode,bo.getLocationCode())
+            .eq(WmsInventory::getMaterialCategories,bo.getMaterialCategories());
         return baseMapper.selectVoList(lqw);
     }