lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

出库部分

Browse Source
This commit is contained in:
张怡蓉
2025-08-04 16:11:25 +08:00
parent b8a7699aed
commit a75f289184
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/controller/OutMydoJobController.java
View File

@@ -15,10 +15,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import static com.ruoyi.common.utils.PageUtils.startPage; import static com.ruoyi.common.utils.PageUtils.startPage;
@RestController @RestController

12
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
View File

@@ -9,6 +9,7 @@ import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockin.domain.InStockin;
@@ -28,6 +29,7 @@ import com.ruoyi.pda.trayMsg.domain.TrayMsg;
import com.ruoyi.pda.trayMsg.service.ITrayMsgService; import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
import com.ruoyi.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.domain.BasStock;
import com.ruoyi.stock.stock.service.IBasStockService; import com.ruoyi.stock.stock.service.IBasStockService;
import com.ruoyi.system.service.ISysDictTypeService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -66,6 +68,8 @@ public class PdaController extends BaseController {
private IInStockinService inStockinService; private IInStockinService inStockinService;
@Autowired @Autowired
private IOutStockoutService outStockoutService; private IOutStockoutService outStockoutService;
@Autowired
private ISysDictTypeService dictTypeService;
/** /**
* 空托盘入库 * 空托盘入库
@@ -365,6 +369,7 @@ public class PdaController extends BaseController {
MydoJob mydoJob = new MydoJob(); MydoJob mydoJob = new MydoJob();
mydoJob.setTrayCode(trayCodeMsg.getTrayCode()); mydoJob.setTrayCode(trayCodeMsg.getTrayCode());
mydoJob.setStatus(trayCodeMsg.getStatus()); mydoJob.setStatus(trayCodeMsg.getStatus());
mydoJob.setInOut(trayCodeMsg.getInOut());
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob); List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
if(mydoJobs.isEmpty()){ if(mydoJobs.isEmpty()){
log.error("此托盘没有作业"); log.error("此托盘没有作业");
@@ -455,5 +460,12 @@ public class PdaController extends BaseController {
public AjaxResult bindShelf(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { public AjaxResult bindShelf(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
return pdaService.bindShelf(trayCodeMakeSure); return pdaService.bindShelf(trayCodeMakeSure);
} }
@RequestMapping("/selectDictData")
@ResponseBody
public List<SysDictData> selectDictData(@RequestParam("dictType") String dictType) {
List<SysDictData> list = dictTypeService.selectDictDataByType(dictType);
return list;
}
} }