|
@@ -12,6 +12,7 @@ import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.page.TableDataInfo;
|
|
|
import com.ruoyi.common.enums.BusinessType;
|
|
|
+import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
@@ -40,6 +41,15 @@ public class InvLotLocIdController extends BaseController {
|
|
|
@GetMapping("/list")
|
|
|
public TableDataInfo list(InvLocIdSearchFrom invLocIdSearchFrom) {
|
|
|
startPage();
|
|
|
+ if (StringUtils.isNotEmpty(invLocIdSearchFrom.getLotatt07())) {
|
|
|
+ invLocIdSearchFrom.getLotattDTO().setLotatt07(invLocIdSearchFrom.getLotatt07());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(invLocIdSearchFrom.getLotatt08())) {
|
|
|
+ invLocIdSearchFrom.getLotattDTO().setLotatt08(invLocIdSearchFrom.getLotatt08());
|
|
|
+ }
|
|
|
+ if (StringUtils.isNotEmpty(invLocIdSearchFrom.getLotatt14())) {
|
|
|
+ invLocIdSearchFrom.getLotattDTO().setLotatt14(invLocIdSearchFrom.getLotatt14());
|
|
|
+ }
|
|
|
List<InvLotLocIdLotattVO> list = invLotLocIdService.selectInvLocIdLotattList(invLocIdSearchFrom);
|
|
|
return getDataTable(list);
|
|
|
}
|