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

1234

Browse Source
This commit is contained in:
张怡蓉
2025-12-15 14:41:56 +08:00
parent 79f8757005
commit ef61898303
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
View File

@@ -458,7 +458,7 @@ public class ToErpServiceImpl implements IToErpService {
* 入库单据 -> 请求入库单列表 * 入库单据 -> 请求入库单列表
* @return * @return
*/ */
@Scheduled(fixedDelay = 600_000) // @Scheduled(fixedDelay = 600_000)
public AjaxResult getErpStockinList(){ public AjaxResult getErpStockinList(){
ErpStockinParam erpStockinParam = new ErpStockinParam(); ErpStockinParam erpStockinParam = new ErpStockinParam();

8
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -139,13 +139,17 @@ public class ToWmsServiceImpl implements IToWmsService {
mydoJobService.getInJobId(map);//存储过程【util_serial_job】生成作业号 mydoJobService.getInJobId(map);//存储过程【util_serial_job】生成作业号
mydoJob.setJobId(map.get("v_serial")); mydoJob.setJobId(map.get("v_serial"));
mydoJob.setCargoSpaceId(cargoSpaceId); mydoJob.setCargoSpaceId(cargoSpaceId);
mydoJob.setStatus("3");
mydoJob.setInOrOut("1"); mydoJob.setInOrOut("1");
mydoJob.setTrayCode(requestEnter.getTrayCode()); mydoJob.setTrayCode(requestEnter.getTrayCode());
map.put("v_param", "1"); map.put("v_param", "1");
mydoJobService.getInTask(map); mydoJobService.getInTask(map);
mydoJob.setTaskNo(map.get("v_serial")); mydoJob.setTaskNo(map.get("v_serial"));
// HashMap<String, String> result = new HashMap<>(); BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId);
// result.put("cargoSpaceId",cargoSpaceId); mydoJob.setRoadwayId(basCargoSpace.getTheFloor().toString());
mydoJob.setCreateTime(new Date());
mydoJobService.insertMydoJob(mydoJob);
return AjaxResult.success(mydoJob); return AjaxResult.success(mydoJob);
} }
/** /**

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

@@ -136,9 +136,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
*/ */
@Override @Override
public int insertMydoJob(MydoJob mydoJob) { public int insertMydoJob(MydoJob mydoJob) {
mydoJob.setCreateTime(new Date());
mydoJob.setJobId(basJobIdService.getJobId("RK"));
mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
return mydoJobMapper.insertMydoJob(mydoJob); return mydoJobMapper.insertMydoJob(mydoJob);
} }

2
ruoyi-ui/src/views/in/stockIn/index.vue
View File

@@ -177,7 +177,7 @@
<el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码--> <el-table-column label="物料编码" align="left" prop="productId"/><!--物料编码-->
<el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码--> <el-table-column label="物料名称" align="left" prop="productName" width="160"/><!--物料编码-->
<el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量--> <el-table-column label="计划数量" align="right" prop="quantity"/><!--计划数量-->
<el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫码数量--> <el-table-column label="扫码数量" align="right" prop="scanNum"/><!--扫 码数量-->
<el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量--> <el-table-column label="实际数量" align="right" prop="assignNum"/><!--实际数量-->
<el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商--> <el-table-column label="供应商" align="left" prop="supplierName" width="160"/><!--供应商-->
<el-table-column label="规格型号" align="left" prop="spec" width="160"/> <el-table-column label="规格型号" align="left" prop="spec" width="160"/>