线边库和订单 基本搭建

houshuai

2025-07-03 8c945d42c6610abd9ef17bc153114024175bec2a

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java

@@ -6,12 +6,15 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.jeecg.modules.lsw.entity.LswMaterial;
import org.jeecg.modules.lsw.entity.LswMaterialInventory;
import org.jeecg.modules.lsw.service.ILswMaterialInventoryService;
@@ -52,6 +55,8 @@
   private ILswMaterialService lswMaterialService;
   @Autowired
   private ILswMaterialInventoryService lswMaterialInventoryService;
    @Autowired
    private ILineSideWarehouseService lineSideWarehouseService;

   /**
    * 分页列表查询
@@ -172,6 +177,13 @@
   @GetMapping(value = "/queryLswMaterialInventoryByMainId")
   public Result<List<LswMaterialInventory>> queryLswMaterialInventoryListByMainId(@RequestParam(name="id",required=true) String id) {
       List<LswMaterialInventory> lswMaterialInventoryList = lswMaterialInventoryService.selectByMainId(id);
        for (LswMaterialInventory lswMaterialInventory : lswMaterialInventoryList) {
            if(StringUtils.isNotEmpty(lswMaterialInventory.getWarehouseId())){
                String warehouseId = lswMaterialInventory.getWarehouseId();
                LineSideWarehouse warehouse = lineSideWarehouseService.getById(warehouseId);
                lswMaterialInventory.setWarehouseName(warehouse.getWarehouseName());
            }
        }
       return Result.OK(lswMaterialInventoryList);
   }

@@ -257,4 +269,13 @@
     return Result.OK("文件导入失败！");
   }

    @GetMapping(value = "/searchlikeQuery")
    public Result<?> searchlikeQuery(LswMaterial lswMaterial,
                                     @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                     @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                     HttpServletRequest req) {
        IPage<Map<String, Object>> pageList = lswMaterialService.getLswMaterialListData(pageNo, pageSize, req);
        return Result.OK(pageList);
    }

}