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-06-12 08:39:53 +08:00
parent 9236aa7fa6
commit 51eeb3ee28
16 changed files with 655 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.service.PdaService;
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
import com.ruoyi.stock.stock.domain.BasStock;
import com.ruoyi.stock.stock.service.IBasStockService;
import org.springframework.web.bind.annotation.RequestBody;
@@ -31,11 +35,13 @@ public class PdaController extends BaseController {
@Autowired
private PdaService pdaService;
@Autowired
private IInStockinService inStockinService;
private IInStockinDetailService inStockinDetailService;
@Autowired
private IBasStockService basStockService;
@Autowired
private IBasWarehouseService basWarehouseService;
@Autowired
private ITrayMsgService trayMsgService;
/**
* 空托盘入库
@@ -116,12 +122,54 @@ public class PdaController extends BaseController {
return pdaService.emptyBoxOut(trayCodeMsg);
}
@RequestMapping("/inorder/list")
/**
* 绑盘查询入库单详情
* @param stockinDetailId
* @return
*/
@RequestMapping("/inorder/detail")
@ResponseBody
public List<InStockin> inoderList(String stockinDetailId) {
List<InStockin> stockins = inStockinService.selectStockinByDetail(stockinDetailId);
return stockins;
public List<InStockinDetail> inoderList(String stockinDetailId) {
List<InStockinDetail> inStockinDetail = inStockinDetailService.selectStockinByDetailById(stockinDetailId);
return inStockinDetail;
}
/**
* 绑定托盘物料
*/
@RequestMapping("/bindTrayMsg")
@ResponseBody
public AjaxResult bindTrayMsg(@RequestBody TrayCodeMsg trayCodeMsg) {
return pdaService.bindTrayMsg(trayCodeMsg);
}
/**
* 查询托盘已绑定物料
*/
@RequestMapping("/bindMsg")
@ResponseBody
public AjaxResult bindMsg(String trayCode) {
TrayMsg trayMsg = new TrayMsg();
trayMsg.setTrayCode(trayCode);
List<TrayMsg> trayMsgs = trayMsgService.selectTrayMsgList(trayMsg);
return AjaxResult.success(trayMsgs);
}
/**
* 确认入库
*/
@RequestMapping("/addInJob")
@ResponseBody
public AjaxResult addInJob(@RequestBody TrayCodeMsg trayCodeMsg) {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId());
if(basWarehouse==null){
return AjaxResult.error("仓库不存在");
}
if("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())){
return AjaxResult.error("请选择高架库货位");
}
if("2".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getEntranceId())){
return AjaxResult.error("请选择入口");
}
return pdaService.addInJob(trayCodeMsg);
}
}

20
ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java
View File

@@ -6,7 +6,7 @@ private String trayCode;
private String warehouseId;
private String quantity;
private String inQuantity;
private String entranceId;
@@ -14,6 +14,16 @@ private String cargoSpaceId;
private String exitId;
private String stockinDetailId;
public String getStockinDetailId() {
return stockinDetailId;
}
public void setStockinDetailId(String stockinDetailId) {
this.stockinDetailId = stockinDetailId;
}
public String getExitId() {
return exitId;
}
@@ -54,11 +64,11 @@ private String exitId;
this.warehouseId = warehouseId;
}
public String getQuantity() {
return quantity;
public String getInQuantity() {
return inQuantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
public void setInQuantity(String inQuantity) {
this.inQuantity = inQuantity;
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java
View File

@@ -11,4 +11,8 @@ public interface PdaMapper {
void emptyTrayOut(HashMap<String, Object> map);
void emptyBoxOut(HashMap<String, Object> map);
void bindTrayMsg(HashMap<String, Object> map);
void addInJob(HashMap<String, Object> map);
}

12
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java
View File

@@ -3,6 +3,9 @@ package com.ruoyi.pda.service;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.pda.domain.TrayCodeMsg;
import org.apache.poi.ss.formula.functions.T;
import org.aspectj.weaver.loadtime.Aj;
import java.util.List;
public interface PdaService {
@@ -13,4 +16,13 @@ public interface PdaService {
public AjaxResult emptyTrayOut(TrayCodeMsg trayCodeMsg);
public AjaxResult emptyBoxOut(TrayCodeMsg trayCodeMsg);
public AjaxResult bindTrayMsg(TrayCodeMsg trayCodeMsg);
public AjaxResult addInJob(TrayCodeMsg trayCodeMsg);
}

36
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
View File

@@ -8,7 +8,10 @@ import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.mapper.PdaMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@Service
public class PdaServiceImp implements PdaService{
@@ -88,4 +91,37 @@ public class PdaServiceImp implements PdaService{
return AjaxResult.warn(map.get("v_resultmsg").toString());
}
}
@Override
public AjaxResult bindTrayMsg(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_stockin_detail_id", trayCodeMsg.getStockinDetailId());
map.put("v_quantity", Integer.parseInt(trayCodeMsg.getInQuantity()));
pdaMapper.bindTrayMsg(map);
String result = map.get("v_result").toString();
if("10".equals(result)){
return AjaxResult.success(map.get("v_resultmsg").toString());
}else{
return AjaxResult.warn(map.get("v_resultmsg").toString());
}
}
@Override
public AjaxResult addInJob(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
map.put("v_cargo_space_id", trayCodeMsg.getCargoSpaceId());
map.put("v_entrance_id", trayCodeMsg.getEntranceId());
pdaMapper.addInJob(map);
String result = map.get("v_result").toString();
if("10".equals(result)){
return AjaxResult.success(map.get("v_resultmsg").toString());
}else{
return AjaxResult.warn(map.get("v_resultmsg").toString());
}
}
}

104
ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/controller/TrayMsgController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.pda.trayMsg.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* trayMsgController
*
* @author ruoyi
* @date 2025-06-11
*/
@RestController
@RequestMapping("/pda/trayMsg")
public class TrayMsgController extends BaseController
{
@Autowired
private ITrayMsgService trayMsgService;
/**
* 查询trayMsg列表
*/
@PreAuthorize("@ss.hasPermi('pda:trayMsg:list')")
@GetMapping("/list")
public TableDataInfo list(TrayMsg trayMsg)
{
startPage();
List<TrayMsg> list = trayMsgService.selectTrayMsgList(trayMsg);
return getDataTable(list);
}
/**
* 导出trayMsg列表
*/
@PreAuthorize("@ss.hasPermi('pda:trayMsg:export')")
@Log(title = "trayMsg", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TrayMsg trayMsg)
{
List<TrayMsg> list = trayMsgService.selectTrayMsgList(trayMsg);
ExcelUtil<TrayMsg> util = new ExcelUtil<TrayMsg>(TrayMsg.class);
util.exportExcel(response, list, "trayMsg数据");
}
/**
* 获取trayMsg详细信息
*/
@PreAuthorize("@ss.hasPermi('pda:trayMsg:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
return success(trayMsgService.selectTrayMsgById(id));
}
/**
* 新增trayMsg
*/
@PreAuthorize("@ss.hasPermi('pda:trayMsg:add')")
@Log(title = "trayMsg", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TrayMsg trayMsg)
{
return toAjax(trayMsgService.insertTrayMsg(trayMsg));
}
/**
* 修改trayMsg
*/
@PreAuthorize("@ss.hasPermi('pda:trayMsg:edit')")
@Log(title = "trayMsg", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TrayMsg trayMsg)
{
return toAjax(trayMsgService.updateTrayMsg(trayMsg));
}
/**
* 删除trayMsg
*/
@PreAuthorize("@ss.hasPermi('pda:trayMsg:remove')")
@Log(title = "trayMsg", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
{
return toAjax(trayMsgService.deleteTrayMsgByIds(ids));
}
}

92
ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/domain/TrayMsg.java Normal file
View File

@@ -0,0 +1,92 @@
package com.ruoyi.pda.trayMsg.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* trayMsg对象 tray_msg
*
* @author ruoyi
* @date 2025-06-11
*/
public class TrayMsg extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 序号 */
private String id;
/** 托盘条码 */
@Excel(name = "托盘条码")
private String trayCode;
/** 子单编码 */
@Excel(name = "子单编码")
private String stockinDetailId;
/** 数量 */
@Excel(name = "数量")
private String quantity;
private String productName;
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public void setId(String id)
{
this.id = id;
}
public String getId()
{
return id;
}
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
{
return trayCode;
}
public void setStockinDetailId(String stockinDetailId)
{
this.stockinDetailId = stockinDetailId;
}
public String getStockinDetailId()
{
return stockinDetailId;
}
public void setQuantity(String quantity)
{
this.quantity = quantity;
}
public String getQuantity()
{
return quantity;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("trayCode", getTrayCode())
.append("stockinDetailId", getStockinDetailId())
.append("quantity", getQuantity())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/mapper/TrayMsgMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.pda.trayMsg.mapper;
import java.util.List;
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
/**
* trayMsgMapper接口
*
* @author ruoyi
* @date 2025-06-11
*/
public interface TrayMsgMapper
{
/**
* 查询trayMsg
*
* @param id trayMsg主键
* @return trayMsg
*/
public TrayMsg selectTrayMsgById(String id);
/**
* 查询trayMsg列表
*
* @param trayMsg trayMsg
* @return trayMsg集合
*/
public List<TrayMsg> selectTrayMsgList(TrayMsg trayMsg);
/**
* 新增trayMsg
*
* @param trayMsg trayMsg
* @return 结果
*/
public int insertTrayMsg(TrayMsg trayMsg);
/**
* 修改trayMsg
*
* @param trayMsg trayMsg
* @return 结果
*/
public int updateTrayMsg(TrayMsg trayMsg);
/**
* 删除trayMsg
*
* @param id trayMsg主键
* @return 结果
*/
public int deleteTrayMsgById(String id);
/**
* 批量删除trayMsg
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTrayMsgByIds(String[] ids);
}

61
ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/service/ITrayMsgService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.pda.trayMsg.service;
import java.util.List;
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
/**
* trayMsgService接口
*
* @author ruoyi
* @date 2025-06-11
*/
public interface ITrayMsgService
{
/**
* 查询trayMsg
*
* @param id trayMsg主键
* @return trayMsg
*/
public TrayMsg selectTrayMsgById(String id);
/**
* 查询trayMsg列表
*
* @param trayMsg trayMsg
* @return trayMsg集合
*/
public List<TrayMsg> selectTrayMsgList(TrayMsg trayMsg);
/**
* 新增trayMsg
*
* @param trayMsg trayMsg
* @return 结果
*/
public int insertTrayMsg(TrayMsg trayMsg);
/**
* 修改trayMsg
*
* @param trayMsg trayMsg
* @return 结果
*/
public int updateTrayMsg(TrayMsg trayMsg);
/**
* 批量删除trayMsg
*
* @param ids 需要删除的trayMsg主键集合
* @return 结果
*/
public int deleteTrayMsgByIds(String[] ids);
/**
* 删除trayMsg信息
*
* @param id trayMsg主键
* @return 结果
*/
public int deleteTrayMsgById(String id);
}

93
ruoyi-admin/src/main/java/com/ruoyi/pda/trayMsg/service/impl/TrayMsgServiceImpl.java Normal file
View File

@@ -0,0 +1,93 @@
package com.ruoyi.pda.trayMsg.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.pda.trayMsg.mapper.TrayMsgMapper;
import com.ruoyi.pda.trayMsg.domain.TrayMsg;
import com.ruoyi.pda.trayMsg.service.ITrayMsgService;
/**
* trayMsgService业务层处理
*
* @author ruoyi
* @date 2025-06-11
*/
@Service
public class TrayMsgServiceImpl implements ITrayMsgService
{
@Autowired
private TrayMsgMapper trayMsgMapper;
/**
* 查询trayMsg
*
* @param id trayMsg主键
* @return trayMsg
*/
@Override
public TrayMsg selectTrayMsgById(String id)
{
return trayMsgMapper.selectTrayMsgById(id);
}
/**
* 查询trayMsg列表
*
* @param trayMsg trayMsg
* @return trayMsg
*/
@Override
public List<TrayMsg> selectTrayMsgList(TrayMsg trayMsg)
{
return trayMsgMapper.selectTrayMsgList(trayMsg);
}
/**
* 新增trayMsg
*
* @param trayMsg trayMsg
* @return 结果
*/
@Override
public int insertTrayMsg(TrayMsg trayMsg)
{
return trayMsgMapper.insertTrayMsg(trayMsg);
}
/**
* 修改trayMsg
*
* @param trayMsg trayMsg
* @return 结果
*/
@Override
public int updateTrayMsg(TrayMsg trayMsg)
{
return trayMsgMapper.updateTrayMsg(trayMsg);
}
/**
* 批量删除trayMsg
*
* @param ids 需要删除的trayMsg主键
* @return 结果
*/
@Override
public int deleteTrayMsgByIds(String[] ids)
{
return trayMsgMapper.deleteTrayMsgByIds(ids);
}
/**
* 删除trayMsg信息
*
* @param id trayMsg主键
* @return 结果
*/
@Override
public int deleteTrayMsgById(String id)
{
return trayMsgMapper.deleteTrayMsgById(id);
}
}