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

物料

Browse Source
This commit is contained in:
张怡蓉
2025-11-03 10:00:29 +08:00
parent bec3d856e5
commit 6f0b7fa0a5
10 changed files with 78 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -513,13 +513,10 @@ public class MydoJobServiceImpl implements IMydoJobService {
if (!"10".equals(result)) { if (!"10".equals(result)) {
Stringbuilder += stockId + msg + "<br/>"; Stringbuilder += stockId + msg + "<br/>";
} }
} }
if (!StrUtil.isEmpty(Stringbuilder)) { if (!StrUtil.isEmpty(Stringbuilder)) {
return AjaxResult.warn(Stringbuilder); return AjaxResult.warn(Stringbuilder);
} }
return AjaxResult.success(); return AjaxResult.success();
} }

1
ruoyi-admin/src/main/java/com/ruoyi/job/mydojobdetail/domain/MydoJobDetail.java
View File

@@ -152,6 +152,7 @@ public class MydoJobDetail extends BaseEntity
private String unit; private String unit;
private String trayCode; private String trayCode;
private String cargoNo; private String cargoNo;
private String warehouseId;

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

@@ -131,6 +131,12 @@ public class PdaController extends BaseController {
return pdaService.rkSure(trayCodeMsg); return pdaService.rkSure(trayCodeMsg);
} }
@RequestMapping("/rkSurepk")
@ResponseBody
public AjaxResult rkSurepk(@RequestBody TrayCodeMsg trayCodeMsg) {
return pdaService.rkSurepk(trayCodeMsg);
}
@RequestMapping("/ktpout") @RequestMapping("/ktpout")
@ResponseBody @ResponseBody
public AjaxResult ktpout(@RequestBody TrayCodeMsg trayCodeMsg) { public AjaxResult ktpout(@RequestBody TrayCodeMsg trayCodeMsg) {

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

@@ -32,6 +32,8 @@ public interface PdaService {
AjaxResult rkSure(TrayCodeMsg trayCodeMsg); AjaxResult rkSure(TrayCodeMsg trayCodeMsg);
AjaxResult rkSurepk(TrayCodeMsg trayCodeMsg);
AjaxResult ktpout(TrayCodeMsg trayCodeMsg); AjaxResult ktpout(TrayCodeMsg trayCodeMsg);
AjaxResult ktpin(TrayCodeMsg trayCodeMsg); AjaxResult ktpin(TrayCodeMsg trayCodeMsg);

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

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.ruoyi.api.domain.RequestEnter; import com.ruoyi.api.domain.RequestEnter;
import com.ruoyi.api.service.IToWmsService; import com.ruoyi.api.service.IToWmsService;
import com.ruoyi.bas.warehouse.domain.BasWarehouse;
import com.ruoyi.bas.warehouse.mapper.BasWarehouseMapper;
import com.ruoyi.check.commit.domain.CheckCommitRecord; import com.ruoyi.check.commit.domain.CheckCommitRecord;
import com.ruoyi.check.commit.service.ICheckCommitRecordService; import com.ruoyi.check.commit.service.ICheckCommitRecordService;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@@ -21,6 +23,8 @@ import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.mapper.PdaMapper; import com.ruoyi.pda.mapper.PdaMapper;
import com.ruoyi.pda.trayMsg.domain.TrayMsg; 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.mapper.BasStockMapper;
import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysRoleService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -48,6 +52,10 @@ public class PdaServiceImp implements PdaService {
private IToWmsService iToWmsService; private IToWmsService iToWmsService;
@Autowired @Autowired
private IMydoJobDetailService mydoJobDetailService; private IMydoJobDetailService mydoJobDetailService;
@Autowired
private BasWarehouseMapper basWarehouseMapper;
@Autowired
private BasStockMapper basStockMapper;
@Override @Override
@@ -88,12 +96,18 @@ public class PdaServiceImp implements PdaService {
@Override @Override
public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) { public AjaxResult outMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
MydoJob mydoJobParam = new MydoJob(); MydoJob mydoJobParam = new MydoJob();
//mydoJobParam.setExitId(trayCodeMakeSure.getExitId());
mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode()); mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode());
mydoJobParam.setStatus("3"); mydoJobParam.setStatus("3");
// mydoJobParam.setInOrOut("21");
List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJobParam); List<MydoJobDetail> mydoJobDetails = mydoJobDetailService.selectMydoJobDetailListByExit(mydoJobParam);
if(mydoJobDetails.isEmpty()){ BasWarehouse basWarehouse = basWarehouseMapper.selectBasWarehouseByWarehouseId(mydoJobDetails.get(0).getWarehouseId());
if("2".equals(basWarehouse.getWarehouseType()) && mydoJobDetails.isEmpty()){
BasStock basStock = new BasStock();
basStock.setTrayCode(trayCodeMakeSure.getTrayCode());
List<BasStock> basStocks = basStockMapper.selectBasStockList(basStock);
basStockMapper.deleteBasStockByStockIds((String[]) basStocks.stream().map(BasStock::getStockId).toArray());
}
if(mydoJobDetails.isEmpty() && "1".equals(basWarehouse.getWarehouseType())){
return AjaxResult.error("该物料没有出库作业，请检查"); return AjaxResult.error("该物料没有出库作业，请检查");
} }
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
@@ -192,6 +206,7 @@ public class PdaServiceImp implements PdaService {
public AjaxResult rkSure(TrayCodeMsg trayCodeMsg) { public AjaxResult rkSure(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode()); map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
pdaMapper.rkSure(map); pdaMapper.rkSure(map);
String result = map.get("v_result").toString(); String result = map.get("v_result").toString();
if ("10".equals(result)){ if ("10".equals(result)){
@@ -202,6 +217,17 @@ public class PdaServiceImp implements PdaService {
} }
@Override
public AjaxResult rkSurepk(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
pdaMapper.rkSure(map);
AjaxResult ajaxResult = mydoJobService.manualCompleted(mydoJobService.selectMydoJobByTrayCode(trayCodeMsg.getTrayCode()), 1);
return ajaxResult;
}
@Override @Override
public AjaxResult ktpout(TrayCodeMsg trayCodeMsg) { public AjaxResult ktpout(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
@@ -220,7 +246,7 @@ public class PdaServiceImp implements PdaService {
public AjaxResult ktpin(TrayCodeMsg trayCodeMsg) { public AjaxResult ktpin(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode()); map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_warehouse_id", trayCodeMsg.getWarehouseId()); // map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
pdaMapper.ktpin(map); pdaMapper.ktpin(map);
String result = map.get("v_result").toString(); String result = map.get("v_result").toString();
if ("10".equals(result)){ if ("10".equals(result)){

4
ruoyi-admin/src/main/resources/mapper/job/MydoJobDetailMapper.xml
View File

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productName" column="product_name" /> <result property="productName" column="product_name" />
<result property="trayCode" column="tray_code" /> <result property="trayCode" column="tray_code" />
<result property="supplierName" column="supplier_name" /> <result property="supplierName" column="supplier_name" />
<result property="warehouseId" column="warehouse_id" />
</resultMap> </resultMap>
<select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult"> <select id="selectMydoJobDetailList" parameterType="MydoJobDetail" resultMap="MydoJobDetailResult">
@@ -368,7 +369,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mjd.spare9, mjd.spare9,
mjd.spec, mjd.spec,
mjd.unit, mjd.unit,
mj.tray_code mj.tray_code,
mj.warehosue_id
from mydo_job_detail mjd from mydo_job_detail mjd
left join bas_product bp on mjd.product_id = bp.product_id left join bas_product bp on mjd.product_id = bp.product_id

2
ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml
View File

@@ -113,6 +113,7 @@
<select id="rkSure" parameterType="java.util.Map" statementType="CALLABLE"> <select id="rkSure" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_add_in_job( {call proc_add_in_job(
#{v_tray_code,mode=IN,jdbcType=VARCHAR}, #{v_tray_code,mode=IN,jdbcType=VARCHAR},
#{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=INTEGER}, #{v_result,mode=OUT,jdbcType=INTEGER},
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR} #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)} )}
@@ -130,7 +131,6 @@
<select id="ktpin" parameterType="java.util.Map" statementType="CALLABLE"> <select id="ktpin" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_tp_in( {call proc_tp_in(
#{v_tray_code,mode=IN,jdbcType=VARCHAR}, #{v_tray_code,mode=IN,jdbcType=VARCHAR},
#{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=INTEGER}, #{v_result,mode=OUT,jdbcType=INTEGER},
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR} #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)} )}

50
ruoyi-ui/src/views/bas/warehouse/index.vue
View File

@@ -12,14 +12,14 @@
/> />
</el-form-item> </el-form-item>
<!-- 项目编号 --> <!-- 项目编号 -->
<el-form-item label="项目编号" prop="projectNo"> <!-- <el-form-item label="项目编号" prop="projectNo">-->
<el-input <!-- <el-input-->
v-model="queryParams.projectNo" <!-- v-model="queryParams.projectNo"-->
placeholder="请输入项目编号" <!-- placeholder="请输入项目编号"-->
clearable <!-- clearable-->
@keyup.enter.native="handleQuery" <!-- @keyup.enter.native="handleQuery"-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<!-- 仓库名称 --> <!-- 仓库名称 -->
<el-form-item label="仓库名称" prop="warehouseName"> <el-form-item label="仓库名称" prop="warehouseName">
<el-input <el-input
@@ -146,7 +146,7 @@
<!-- 仓库编号 --> <!-- 仓库编号 -->
<el-table-column label="仓库编号" align="left" prop="warehouseNo" /> <el-table-column label="仓库编号" align="left" prop="warehouseNo" />
<!-- 项目编号 --> <!-- 项目编号 -->
<el-table-column label="项目编号" align="left" prop="projectNo" /> <!-- <el-table-column label="项目编号" align="left" prop="projectNo" />-->
<!-- 仓库名称 --> <!-- 仓库名称 -->
<el-table-column label="仓库名称" align="left" prop="warehouseName" /> <el-table-column label="仓库名称" align="left" prop="warehouseName" />
<!-- 仓库地址 --> <!-- 仓库地址 -->
@@ -154,7 +154,7 @@
<!-- 备注 --> <!-- 备注 -->
<el-table-column label="备注" align="left" prop="cdesc" /> <el-table-column label="备注" align="left" prop="cdesc" />
<!-- 仓库级别 --> <!-- 仓库级别 -->
<el-table-column label="仓库级别" align="left" prop="warehouseKind" /> <!-- <el-table-column label="仓库级别" align="left" prop="warehouseKind" />-->
<!-- 仓库类型 --> <!-- 仓库类型 -->
<el-table-column label="仓库类型" align="left" prop="warehouseType" > <el-table-column label="仓库类型" align="left" prop="warehouseType" >
<template slot-scope="scope"> <template slot-scope="scope">
@@ -210,9 +210,9 @@
<el-input v-model="form.warehouseNo" placeholder="请输入仓库编号" /> <el-input v-model="form.warehouseNo" placeholder="请输入仓库编号" />
</el-form-item> </el-form-item>
<!-- 项目编号 --> <!-- 项目编号 -->
<el-form-item label="项目编号" prop="projectNo"> <!-- <el-form-item label="项目编号" prop="projectNo">-->
<el-input v-model="form.projectNo" placeholder="请输入项目编号" /> <!-- <el-input v-model="form.projectNo" placeholder="请输入项目编号" />-->
</el-form-item> <!-- </el-form-item>-->
<!-- 仓库名称 --> <!-- 仓库名称 -->
<el-form-item label="仓库名称" prop="warehouseName"> <el-form-item label="仓库名称" prop="warehouseName">
<el-input v-model="form.warehouseName" placeholder="请输入仓库名称" /> <el-input v-model="form.warehouseName" placeholder="请输入仓库名称" />
@@ -226,14 +226,14 @@
<el-input v-model="form.cdesc" placeholder="请输入备注" /> <el-input v-model="form.cdesc" placeholder="请输入备注" />
</el-form-item> </el-form-item>
<!-- 仓库级别 --> <!-- 仓库级别 -->
<el-form-item label="仓库级别" prop="warehouseKind"> <!-- <el-form-item label="仓库级别" prop="warehouseKind">-->
<el-input <!-- <el-input-->
v-model="form.warehouseKind" <!-- v-model="form.warehouseKind"-->
placeholder="请输入仓库级别" <!-- placeholder="请输入仓库级别"-->
maxlength="2" <!-- maxlength="2"-->
show-word-limit <!-- show-word-limit-->
/> <!-- />-->
</el-form-item> <!-- </el-form-item>-->
<!-- 仓库类型 --> <!-- 仓库类型 -->
<el-form-item label="仓库类型" prop="warehouseType"> <el-form-item label="仓库类型" prop="warehouseType">
<el-select v-model="form.warehouseType" placeholder="请选择仓库类型"> <el-select v-model="form.warehouseType" placeholder="请选择仓库类型">
@@ -327,10 +327,10 @@ export default {
// 校验---仓库是否可用选项是否为空 // 校验---仓库是否可用选项是否为空
{ required: true, message: "是否可用不能为空", trigger: "change" } { required: true, message: "是否可用不能为空", trigger: "change" }
], ],
warehouseKind: [ warehouseType: [
// 校验---仓库级别长度限制 // 校验---仓库是否可用选项是否为空
{ max: 2, message: "仓库级别不能超过2个字符", trigger: "blur" } { required: true, message: "仓库类型不能为空", trigger: "blur" }
] ],
}, },
//修改【仓库管理】界面id文本框是否可交互 //修改【仓库管理】界面id文本框是否可交互

5
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -334,6 +334,11 @@
<el-table-column type="selection" width="55" align="center" :selectable="stockSelectable" /> <el-table-column type="selection" width="55" align="center" :selectable="stockSelectable" />
<el-table-column label="库存编码" align="center" prop="stockId" /> <el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" /> <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="仓库" align="center" prop="warehouseId" >
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
</template>
</el-table-column>
<el-table-column label="批次号" align="center" prop="lotNo" /> <el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="物料编码" align="center" prop="productId" /> <el-table-column label="物料编码" align="center" prop="productId" />
<el-table-column label="物料名称" align="center" prop="productName" /> <el-table-column label="物料名称" align="center" prop="productName" />

5
ruoyi-ui/src/views/stock/pointOut.vue
View File

@@ -60,6 +60,11 @@
<el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650"> <el-table v-loading="loading" :data="managementList" @selection-change="handleSelectionChange" max-height="650">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="库存编码" align="center" prop="stockId" /> <el-table-column label="库存编码" align="center" prop="stockId" />
<el-table-column label="仓库" align="center" prop="warehouseId" >
<template slot-scope="scope">
<dict-tag :options="dict.type.warehouse" :value="scope.row.warehouseId"/>
</template>
</el-table-column>
<el-table-column label="货位名称" align="center" prop="cargoSpaceName" /> <el-table-column label="货位名称" align="center" prop="cargoSpaceName" />
<el-table-column label="批次号" align="center" prop="lotNo" /> <el-table-column label="批次号" align="center" prop="lotNo" />
<el-table-column label="物料编码" align="center" prop="productId" /> <el-table-column label="物料编码" align="center" prop="productId" />