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

接口记录表 wcs对外接口 绑定料架接口

Browse Source
This commit is contained in:
liuhanqing
2025-07-10 09:26:00 +08:00
parent 0baf2119e4
commit 8e3f72e0ae
28 changed files with 1934 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToWmsApiController.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.api.controller;
import com.ruoyi.api.domain.WmsJobRequest;
import com.ruoyi.api.service.IToWmsService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.job.mydojob.domain.MydoJob;
import com.ruoyi.job.mydojob.service.IMydoJobService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* 作业统计 Controller
*/
@RestController
@RequestMapping("/api2wms")
public class ToWmsApiController {
@Autowired
private IToWmsService toWmsService;
/**
* 入库任务请求
*/
@PostMapping("/inJob")
public AjaxResult inJob(@RequestBody MydoJob mydoJob) {
return toWmsService.inJob(mydoJob);
}
/**
* 入库、出库 任务完成回传
* Map<String, String>
* "wmsType": "任务类型" 1-入库 2-出库 3-agv搬运,
* taskNo：出库 入库任务号
* trayCode:托盘码
* positionCode1：起点
* positionCode2：终点
* containerCode：容器编码
*
*/
@PostMapping("/jobFinish")
public AjaxResult jobFinish(@RequestBody WmsJobRequest wmsJobRequest) {
return toWmsService.jobFinish(wmsJobRequest);
}
/**
* 放货有货，重新分配货位
*/
@GetMapping("/reAssign")
public AjaxResult reAssign(MydoJob mydoJob) {
return AjaxResult.success();
}
/**
* 取货无货，重新分配物料
*/
@GetMapping("/reMaterial")
public AjaxResult reMaterial(MydoJob mydoJob) {
return AjaxResult.success();
}
}

23
ruoyi-admin/src/main/java/com/ruoyi/api/domain/WmsJobRequest.java Normal file
View File

@@ -0,0 +1,23 @@
package com.ruoyi.api.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class WmsJobRequest {
//wms任务类型 1 入库 2-出库 3-agv任务
private String wmsType;
//wms任务号
private String taskNo;
//托盘编码
private String trayCode;
//料架编码
private String containerCode;
//起点
private String positionCode1;
//终点
private String positionCode2;
}

17
ruoyi-admin/src/main/java/com/ruoyi/api/service/IToWmsService.java Normal file
View File

@@ -0,0 +1,17 @@
package com.ruoyi.api.service;
import com.ruoyi.api.domain.WmsJobRequest;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.job.mydojob.domain.MydoJob;
import java.util.Map;
/**
* 作业统计 Service 接口
*/
public interface IToWmsService {
AjaxResult inJob(MydoJob mydoJob);
AjaxResult jobFinish(WmsJobRequest wmsJobRequest);
}

95
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java Normal file
View File

@@ -0,0 +1,95 @@
package com.ruoyi.api.service.impl;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil;
import com.ruoyi.api.domain.WmsJobRequest;
import com.ruoyi.api.mapper.JobStatisticsMapper;
import com.ruoyi.api.service.IJobStatisticsService;
import com.ruoyi.api.service.IToWmsService;
import com.ruoyi.bas.cargoSpace.mapper.BasCargoSpaceMapper;
import com.ruoyi.bas.container.domain.BasContainer;
import com.ruoyi.bas.container.service.IBasContainerService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.job.mydojob.domain.MydoJob;
import com.ruoyi.job.mydojob.mapper.MydoJobMapper;
import com.ruoyi.job.mydojob.service.IMydoJobService;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 作业统计 Service 实现
*/
@Service
public class ToWmsServiceImpl implements IToWmsService {
@Autowired
private IMydoJobService mydoJobService;
@Autowired
private IBasContainerService basContainerService;
@Override
public AjaxResult inJob(MydoJob mydoJob) {
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
if(mydoJobs.isEmpty()){
return AjaxResult.error("此托盘没有作业");
}
return AjaxResult.success(mydoJobs.get(0));
}
@Override
public AjaxResult jobFinish(WmsJobRequest wmsJobRequest) {
MydoJob mydoJobParam = new MydoJob();
switch (wmsJobRequest.getWmsType()){
case "1":
//入库
mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode());
List<MydoJob> inMydoJobs = mydoJobService.selectMydoJobList(mydoJobParam);
if (inMydoJobs.isEmpty()){
return AjaxResult.error("没有该作业 taskNo: {}", wmsJobRequest.getTaskNo());
}
MydoJob inMydoJob = inMydoJobs.get(0);
mydoJobService.manualCompleted(inMydoJob);
break;
case "2":
//出库
mydoJobParam.setTaskNo(wmsJobRequest.getTaskNo());
mydoJobParam.setTrayCode(wmsJobRequest.getTrayCode());
List<MydoJob> outMydoJobs = mydoJobService.selectMydoJobList(mydoJobParam);
if (outMydoJobs.isEmpty()){
return AjaxResult.error("没有该作业 taskNo: {}", wmsJobRequest.getTaskNo());
}
//mydoJobService.OuthandFinish(outMydoJobs.stream().map(MydoJob::getJobId).toArray(String[]::new));
//todo 同步电子标签
break;
case "3":
//agv搬运作业
//绑定料架和点位
BasContainer basContainerParam = new BasContainer();
basContainerParam.setContainerId(wmsJobRequest.getContainerCode());
basContainerParam.setPortName(wmsJobRequest.getPositionCode1());
List<BasContainer> basContainers = basContainerService.selectBasContainerList(basContainerParam);
if (basContainers.isEmpty()){
return AjaxResult.error("没有该料架 {}", wmsJobRequest.getContainerCode());
}
//修改绑定点位
BasContainer basContainer = basContainers.get(0);
basContainer.setPortName(wmsJobRequest.getPositionCode2());
basContainerService.updateBasContainer(basContainer);
break;
default:
return AjaxResult.error("作业类型错误");
}
return null;
}
}

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

@@ -1,7 +1,6 @@
package com.ruoyi.job.mydojob.service.impl;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -23,10 +22,10 @@ import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
import com.ruoyi.out.domain.OutExceptionRecord;
import com.ruoyi.out.exception.domain.OutExceptionRecord;
import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
import com.ruoyi.out.service.IOutExceptionRecordService;
import com.ruoyi.out.exception.service.IOutExceptionRecordService;
import com.ruoyi.stock.stock.domain.BasStock;
import com.ruoyi.stock.stock.service.IBasStockService;
import org.springframework.beans.factory.annotation.Autowired;

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

@@ -126,6 +126,16 @@ public class MydoJobDetail extends BaseEntity
//额外字段
private ExtraField extraField;
private String pickQuantityReal;
//绑定容器物品数量
private String pickBindQuantity;
public String getPickBindQuantity() {
return pickBindQuantity;
}
public void setPickBindQuantity(String pickBindQuantity) {
this.pickBindQuantity = pickBindQuantity;
}
public String getPickQuantityReal() {
return pickQuantityReal;

104
ruoyi-admin/src/main/java/com/ruoyi/log/controller/RequestLogController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.log.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.log.domain.RequestLog;
import com.ruoyi.log.service.IRequestLogService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 接口记录Controller
*
* @author ruoyi
* @date 2025-07-02
*/
@RestController
@RequestMapping("/requestInterface/log")
public class RequestLogController extends BaseController
{
@Autowired
private IRequestLogService requestLogService;
/**
* 查询接口记录列表
*/
@PreAuthorize("@ss.hasPermi('requestInterface:log:list')")
@GetMapping("/list")
public TableDataInfo list(RequestLog requestLog)
{
startPage();
List<RequestLog> list = requestLogService.selectRequestLogList(requestLog);
return getDataTable(list);
}
/**
* 导出接口记录列表
*/
@PreAuthorize("@ss.hasPermi('requestInterface:log:export')")
@Log(title = "接口记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, RequestLog requestLog)
{
List<RequestLog> list = requestLogService.selectRequestLogList(requestLog);
ExcelUtil<RequestLog> util = new ExcelUtil<RequestLog>(RequestLog.class);
util.exportExcel(response, list, "接口记录数据");
}
/**
* 获取接口记录详细信息
*/
@PreAuthorize("@ss.hasPermi('requestInterface:log:query')")
@GetMapping(value = "/{requestId}")
public AjaxResult getInfo(@PathVariable("requestId") Long requestId)
{
return success(requestLogService.selectRequestLogByRequestId(requestId));
}
/**
* 新增接口记录
*/
@PreAuthorize("@ss.hasPermi('requestInterface:log:add')")
@Log(title = "接口记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody RequestLog requestLog)
{
return toAjax(requestLogService.insertRequestLog(requestLog));
}
/**
* 修改接口记录
*/
@PreAuthorize("@ss.hasPermi('requestInterface:log:edit')")
@Log(title = "接口记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody RequestLog requestLog)
{
return toAjax(requestLogService.updateRequestLog(requestLog));
}
/**
* 删除接口记录
*/
@PreAuthorize("@ss.hasPermi('requestInterface:log:remove')")
@Log(title = "接口记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{requestIds}")
public AjaxResult remove(@PathVariable Long[] requestIds)
{
return toAjax(requestLogService.deleteRequestLogByRequestIds(requestIds));
}
}

247
ruoyi-admin/src/main/java/com/ruoyi/log/domain/RequestLog.java Normal file
View File

@@ -0,0 +1,247 @@
package com.ruoyi.log.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;
/**
* 接口记录对象 request_log
*
* @author ruoyi
* @date 2025-07-02
*/
public class RequestLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 请求id */
private Long requestId;
/** 请求时间 */
@Excel(name = "请求时间")
private String requestTime;
/** 来源系统 */
@Excel(name = "来源系统")
private String sourceSystem;
/** 目标系统 */
@Excel(name = "目标系统")
private String targetSystem;
/** 接口名称 */
@Excel(name = "接口名称")
private String endpoint;
/** 请求URL */
@Excel(name = "请求URL")
private String requestUrl;
/** 请求方式 */
@Excel(name = "请求方式")
private String requestMethod;
/** 请求头信息 */
@Excel(name = "请求头信息")
private String requestHeaders;
/** 请求参数 */
@Excel(name = "请求参数")
private String requestBody;
/** 响应时间 */
@Excel(name = "响应时间")
private String responseTime;
/** 响应主体 */
@Excel(name = "响应主体")
private String responseBody;
/** 响应状态 */
@Excel(name = "响应状态")
private String responseStatus;
/** 错误信息 */
@Excel(name = "错误信息")
private String errorDetails;
/** 耗时 */
@Excel(name = "耗时")
private String duration;
/** 是否成功 */
@Excel(name = "是否成功")
private String isSuccessful;
public void setRequestId(Long requestId)
{
this.requestId = requestId;
}
public Long getRequestId()
{
return requestId;
}
public void setRequestTime(String requestTime)
{
this.requestTime = requestTime;
}
public String getRequestTime()
{
return requestTime;
}
public void setSourceSystem(String sourceSystem)
{
this.sourceSystem = sourceSystem;
}
public String getSourceSystem()
{
return sourceSystem;
}
public void setTargetSystem(String targetSystem)
{
this.targetSystem = targetSystem;
}
public String getTargetSystem()
{
return targetSystem;
}
public void setEndpoint(String endpoint)
{
this.endpoint = endpoint;
}
public String getEndpoint()
{
return endpoint;
}
public void setRequestUrl(String requestUrl)
{
this.requestUrl = requestUrl;
}
public String getRequestUrl()
{
return requestUrl;
}
public void setRequestMethod(String requestMethod)
{
this.requestMethod = requestMethod;
}
public String getRequestMethod()
{
return requestMethod;
}
public void setRequestHeaders(String requestHeaders)
{
this.requestHeaders = requestHeaders;
}
public String getRequestHeaders()
{
return requestHeaders;
}
public void setRequestBody(String requestBody)
{
this.requestBody = requestBody;
}
public String getRequestBody()
{
return requestBody;
}
public void setResponseTime(String responseTime)
{
this.responseTime = responseTime;
}
public String getResponseTime()
{
return responseTime;
}
public void setResponseBody(String responseBody)
{
this.responseBody = responseBody;
}
public String getResponseBody()
{
return responseBody;
}
public void setResponseStatus(String responseStatus)
{
this.responseStatus = responseStatus;
}
public String getResponseStatus()
{
return responseStatus;
}
public void setErrorDetails(String errorDetails)
{
this.errorDetails = errorDetails;
}
public String getErrorDetails()
{
return errorDetails;
}
public void setDuration(String duration)
{
this.duration = duration;
}
public String getDuration()
{
return duration;
}
public void setIsSuccessful(String isSuccessful)
{
this.isSuccessful = isSuccessful;
}
public String getIsSuccessful()
{
return isSuccessful;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("requestId", getRequestId())
.append("requestTime", getRequestTime())
.append("sourceSystem", getSourceSystem())
.append("targetSystem", getTargetSystem())
.append("endpoint", getEndpoint())
.append("requestUrl", getRequestUrl())
.append("requestMethod", getRequestMethod())
.append("requestHeaders", getRequestHeaders())
.append("requestBody", getRequestBody())
.append("responseTime", getResponseTime())
.append("responseBody", getResponseBody())
.append("responseStatus", getResponseStatus())
.append("errorDetails", getErrorDetails())
.append("duration", getDuration())
.append("isSuccessful", getIsSuccessful())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/log/mapper/RequestLogMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.log.mapper;
import java.util.List;
import com.ruoyi.log.domain.RequestLog;
/**
* 接口记录Mapper接口
*
* @author ruoyi
* @date 2025-07-02
*/
public interface RequestLogMapper
{
/**
* 查询接口记录
*
* @param requestId 接口记录主键
* @return 接口记录
*/
public RequestLog selectRequestLogByRequestId(Long requestId);
/**
* 查询接口记录列表
*
* @param requestLog 接口记录
* @return 接口记录集合
*/
public List<RequestLog> selectRequestLogList(RequestLog requestLog);
/**
* 新增接口记录
*
* @param requestLog 接口记录
* @return 结果
*/
public int insertRequestLog(RequestLog requestLog);
/**
* 修改接口记录
*
* @param requestLog 接口记录
* @return 结果
*/
public int updateRequestLog(RequestLog requestLog);
/**
* 删除接口记录
*
* @param requestId 接口记录主键
* @return 结果
*/
public int deleteRequestLogByRequestId(Long requestId);
/**
* 批量删除接口记录
*
* @param requestIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteRequestLogByRequestIds(Long[] requestIds);
}

61
ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.log.service;
import java.util.List;
import com.ruoyi.log.domain.RequestLog;
/**
* 接口记录Service接口
*
* @author ruoyi
* @date 2025-07-02
*/
public interface IRequestLogService
{
/**
* 查询接口记录
*
* @param requestId 接口记录主键
* @return 接口记录
*/
public RequestLog selectRequestLogByRequestId(Long requestId);
/**
* 查询接口记录列表
*
* @param requestLog 接口记录
* @return 接口记录集合
*/
public List<RequestLog> selectRequestLogList(RequestLog requestLog);
/**
* 新增接口记录
*
* @param requestLog 接口记录
* @return 结果
*/
public int insertRequestLog(RequestLog requestLog);
/**
* 修改接口记录
*
* @param requestLog 接口记录
* @return 结果
*/
public int updateRequestLog(RequestLog requestLog);
/**
* 批量删除接口记录
*
* @param requestIds 需要删除的接口记录主键集合
* @return 结果
*/
public int deleteRequestLogByRequestIds(Long[] requestIds);
/**
* 删除接口记录信息
*
* @param requestId 接口记录主键
* @return 结果
*/
public int deleteRequestLogByRequestId(Long requestId);
}

93
ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java Normal file
View File

@@ -0,0 +1,93 @@
package com.ruoyi.log.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.log.mapper.RequestLogMapper;
import com.ruoyi.log.domain.RequestLog;
import com.ruoyi.log.service.IRequestLogService;
/**
* 接口记录Service业务层处理
*
* @author ruoyi
* @date 2025-07-02
*/
@Service
public class RequestLogServiceImpl implements IRequestLogService
{
@Autowired
private RequestLogMapper requestLogMapper;
/**
* 查询接口记录
*
* @param requestId 接口记录主键
* @return 接口记录
*/
@Override
public RequestLog selectRequestLogByRequestId(Long requestId)
{
return requestLogMapper.selectRequestLogByRequestId(requestId);
}
/**
* 查询接口记录列表
*
* @param requestLog 接口记录
* @return 接口记录
*/
@Override
public List<RequestLog> selectRequestLogList(RequestLog requestLog)
{
return requestLogMapper.selectRequestLogList(requestLog);
}
/**
* 新增接口记录
*
* @param requestLog 接口记录
* @return 结果
*/
@Override
public int insertRequestLog(RequestLog requestLog)
{
return requestLogMapper.insertRequestLog(requestLog);
}
/**
* 修改接口记录
*
* @param requestLog 接口记录
* @return 结果
*/
@Override
public int updateRequestLog(RequestLog requestLog)
{
return requestLogMapper.updateRequestLog(requestLog);
}
/**
* 批量删除接口记录
*
* @param requestIds 需要删除的接口记录主键
* @return 结果
*/
@Override
public int deleteRequestLogByRequestIds(Long[] requestIds)
{
return requestLogMapper.deleteRequestLogByRequestIds(requestIds);
}
/**
* 删除接口记录信息
*
* @param requestId 接口记录主键
* @return 结果
*/
@Override
public int deleteRequestLogByRequestId(Long requestId)
{
return requestLogMapper.deleteRequestLogByRequestId(requestId);
}
}

8
ruoyi-admin/src/main/java/com/ruoyi/out/controller/OutExceptionRecordController.java → ruoyi-admin/src/main/java/com/ruoyi/out/exception/controller/OutExceptionRecordController.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.out.controller;
package com.ruoyi.out.exception.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
@@ -16,14 +16,14 @@ 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.out.domain.OutExceptionRecord;
import com.ruoyi.out.service.IOutExceptionRecordService;
import com.ruoyi.out.exception.domain.OutExceptionRecord;
import com.ruoyi.out.exception.service.IOutExceptionRecordService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 出库异常Controller
*
*
* @author ruoyi
* @date 2025-07-01
*/

36
ruoyi-admin/src/main/java/com/ruoyi/out/domain/OutExceptionRecord.java → ruoyi-admin/src/main/java/com/ruoyi/out/exception/domain/OutExceptionRecord.java
View File

@@ -1,4 +1,4 @@
package com.ruoyi.out.domain;
package com.ruoyi.out.exception.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 出库异常对象 out_exception_record
*
*
* @author ruoyi
* @date 2025-07-01
*/
@@ -46,82 +46,82 @@ public class OutExceptionRecord extends BaseEntity
@Excel(name = "备用3")
private String spare3;
public void setOutGuid(Long outGuid)
public void setOutGuid(Long outGuid)
{
this.outGuid = outGuid;
}
public Long getOutGuid()
public Long getOutGuid()
{
return outGuid;
}
public void setWarehouseId(String warehouseId)
public void setWarehouseId(String warehouseId)
{
this.warehouseId = warehouseId;
}
public String getWarehouseId()
public String getWarehouseId()
{
return warehouseId;
}
public void setStockId(String stockId)
public void setStockId(String stockId)
{
this.stockId = stockId;
}
public String getStockId()
public String getStockId()
{
return stockId;
}
public void setTrayCode(String trayCode)
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
public String getTrayCode()
{
return trayCode;
}
public void setProductId(String productId)
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
public String getProductId()
{
return productId;
}
public void setSpare1(String spare1)
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
public String getSpare3()
{
return spare3;
}

21
ruoyi-admin/src/main/java/com/ruoyi/out/mapper/OutExceptionRecordMapper.java → ruoyi-admin/src/main/java/com/ruoyi/out/exception/mapper/OutExceptionRecordMapper.java
View File

@@ -1,19 +1,20 @@
package com.ruoyi.out.mapper;
package com.ruoyi.out.exception.mapper;
import com.ruoyi.out.exception.domain.OutExceptionRecord;
import java.util.List;
import com.ruoyi.out.domain.OutExceptionRecord;
/**
* 出库异常Mapper接口
*
*
* @author ruoyi
* @date 2025-07-01
*/
public interface OutExceptionRecordMapper
public interface OutExceptionRecordMapper
{
/**
* 查询出库异常
*
*
* @param outGuid 出库异常主键
* @return 出库异常
*/
@@ -21,7 +22,7 @@ public interface OutExceptionRecordMapper
/**
* 查询出库异常列表
*
*
* @param outExceptionRecord 出库异常
* @return 出库异常集合
*/
@@ -29,7 +30,7 @@ public interface OutExceptionRecordMapper
/**
* 新增出库异常
*
*
* @param outExceptionRecord 出库异常
* @return 结果
*/
@@ -37,7 +38,7 @@ public interface OutExceptionRecordMapper
/**
* 修改出库异常
*
*
* @param outExceptionRecord 出库异常
* @return 结果
*/
@@ -45,7 +46,7 @@ public interface OutExceptionRecordMapper
/**
* 删除出库异常
*
*
* @param outGuid 出库异常主键
* @return 结果
*/
@@ -53,7 +54,7 @@ public interface OutExceptionRecordMapper
/**
* 批量删除出库异常
*
*
* @param outGuids 需要删除的数据主键集合
* @return 结果
*/

20
ruoyi-admin/src/main/java/com/ruoyi/out/service/IOutExceptionRecordService.java → ruoyi-admin/src/main/java/com/ruoyi/out/exception/service/IOutExceptionRecordService.java
View File

@@ -1,19 +1,19 @@
package com.ruoyi.out.service;
package com.ruoyi.out.exception.service;
import java.util.List;
import com.ruoyi.out.domain.OutExceptionRecord;
import com.ruoyi.out.exception.domain.OutExceptionRecord;
/**
* 出库异常Service接口
*
*
* @author ruoyi
* @date 2025-07-01
*/
public interface IOutExceptionRecordService
public interface IOutExceptionRecordService
{
/**
* 查询出库异常
*
*
* @param outGuid 出库异常主键
* @return 出库异常
*/
@@ -21,7 +21,7 @@ public interface IOutExceptionRecordService
/**
* 查询出库异常列表
*
*
* @param outExceptionRecord 出库异常
* @return 出库异常集合
*/
@@ -29,7 +29,7 @@ public interface IOutExceptionRecordService
/**
* 新增出库异常
*
*
* @param outExceptionRecord 出库异常
* @return 结果
*/
@@ -37,7 +37,7 @@ public interface IOutExceptionRecordService
/**
* 修改出库异常
*
*
* @param outExceptionRecord 出库异常
* @return 结果
*/
@@ -45,7 +45,7 @@ public interface IOutExceptionRecordService
/**
* 批量删除出库异常
*
*
* @param outGuids 需要删除的出库异常主键集合
* @return 结果
*/
@@ -53,7 +53,7 @@ public interface IOutExceptionRecordService
/**
* 删除出库异常信息
*
*
* @param outGuid 出库异常主键
* @return 结果
*/

24
ruoyi-admin/src/main/java/com/ruoyi/out/service/impl/OutExceptionRecordServiceImpl.java → ruoyi-admin/src/main/java/com/ruoyi/out/exception/service/impl/OutExceptionRecordServiceImpl.java
View File

@@ -1,27 +1,27 @@
package com.ruoyi.out.service.impl;
package com.ruoyi.out.exception.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.out.mapper.OutExceptionRecordMapper;
import com.ruoyi.out.domain.OutExceptionRecord;
import com.ruoyi.out.service.IOutExceptionRecordService;
import com.ruoyi.out.exception.mapper.OutExceptionRecordMapper;
import com.ruoyi.out.exception.domain.OutExceptionRecord;
import com.ruoyi.out.exception.service.IOutExceptionRecordService;
/**
* 出库异常Service业务层处理
*
*
* @author ruoyi
* @date 2025-07-01
*/
@Service
public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
{
@Autowired
private OutExceptionRecordMapper outExceptionRecordMapper;
/**
* 查询出库异常
*
*
* @param outGuid 出库异常主键
* @return 出库异常
*/
@@ -33,7 +33,7 @@ public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
/**
* 查询出库异常列表
*
*
* @param outExceptionRecord 出库异常
* @return 出库异常
*/
@@ -45,7 +45,7 @@ public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
/**
* 新增出库异常
*
*
* @param outExceptionRecord 出库异常
* @return 结果
*/
@@ -57,7 +57,7 @@ public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
/**
* 修改出库异常
*
*
* @param outExceptionRecord 出库异常
* @return 结果
*/
@@ -69,7 +69,7 @@ public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
/**
* 批量删除出库异常
*
*
* @param outGuids 需要删除的出库异常主键
* @return 结果
*/
@@ -81,7 +81,7 @@ public class OutExceptionRecordServiceImpl implements IOutExceptionRecordService
/**
* 删除出库异常信息
*
*
* @param outGuid 出库异常主键
* @return 结果
*/

104
ruoyi-admin/src/main/java/com/ruoyi/out/submit/controller/OutPickSubmitController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.out.submit.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.out.submit.domain.OutPickSubmit;
import com.ruoyi.out.submit.service.IOutPickSubmitService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 出库拣选缓存记录Controller
*
* @author ruoyi
* @date 2025-07-10
*/
@RestController
@RequestMapping("/out/submit")
public class OutPickSubmitController extends BaseController
{
@Autowired
private IOutPickSubmitService outPickSubmitService;
/**
* 查询出库拣选缓存记录列表
*/
@PreAuthorize("@ss.hasPermi('out:submit:list')")
@GetMapping("/list")
public TableDataInfo list(OutPickSubmit outPickSubmit)
{
startPage();
List<OutPickSubmit> list = outPickSubmitService.selectOutPickSubmitList(outPickSubmit);
return getDataTable(list);
}
/**
* 导出出库拣选缓存记录列表
*/
@PreAuthorize("@ss.hasPermi('out:submit:export')")
@Log(title = "出库拣选缓存记录", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, OutPickSubmit outPickSubmit)
{
List<OutPickSubmit> list = outPickSubmitService.selectOutPickSubmitList(outPickSubmit);
ExcelUtil<OutPickSubmit> util = new ExcelUtil<OutPickSubmit>(OutPickSubmit.class);
util.exportExcel(response, list, "出库拣选缓存记录数据");
}
/**
* 获取出库拣选缓存记录详细信息
*/
@PreAuthorize("@ss.hasPermi('out:submit:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(outPickSubmitService.selectOutPickSubmitById(id));
}
/**
* 新增出库拣选缓存记录
*/
@PreAuthorize("@ss.hasPermi('out:submit:add')")
@Log(title = "出库拣选缓存记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody OutPickSubmit outPickSubmit)
{
return toAjax(outPickSubmitService.insertOutPickSubmit(outPickSubmit));
}
/**
* 修改出库拣选缓存记录
*/
@PreAuthorize("@ss.hasPermi('out:submit:edit')")
@Log(title = "出库拣选缓存记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody OutPickSubmit outPickSubmit)
{
return toAjax(outPickSubmitService.updateOutPickSubmit(outPickSubmit));
}
/**
* 删除出库拣选缓存记录
*/
@PreAuthorize("@ss.hasPermi('out:submit:remove')")
@Log(title = "出库拣选缓存记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(outPickSubmitService.deleteOutPickSubmitByIds(ids));
}
}

112
ruoyi-admin/src/main/java/com/ruoyi/out/submit/domain/OutPickSubmit.java Normal file
View File

@@ -0,0 +1,112 @@
package com.ruoyi.out.submit.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;
/**
* 出库拣选缓存记录对象 out_pick_submit
*
* @author ruoyi
* @date 2025-07-10
*/
public class OutPickSubmit extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** $column.columnComment */
private Long id;
/** 托盘码 */
@Excel(name = "托盘码")
private String trayCode;
/** 任务id */
@Excel(name = "任务id")
private String jobId;
/** 子任务id */
@Excel(name = "子任务id")
private String jobDetailId;
/** 物料编码 */
@Excel(name = "物料编码")
private String productId;
/** 物料数量 */
@Excel(name = "物料数量")
private String quantit;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setTrayCode(String trayCode)
{
this.trayCode = trayCode;
}
public String getTrayCode()
{
return trayCode;
}
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getJobId()
{
return jobId;
}
public void setJobDetailId(String jobDetailId)
{
this.jobDetailId = jobDetailId;
}
public String getJobDetailId()
{
return jobDetailId;
}
public void setProductId(String productId)
{
this.productId = productId;
}
public String getProductId()
{
return productId;
}
public void setQuantit(String quantit)
{
this.quantit = quantit;
}
public String getQuantit()
{
return quantit;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("trayCode", getTrayCode())
.append("jobId", getJobId())
.append("jobDetailId", getJobDetailId())
.append("productId", getProductId())
.append("quantit", getQuantit())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/out/submit/mapper/OutPickSubmitMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.out.submit.mapper;
import java.util.List;
import com.ruoyi.out.submit.domain.OutPickSubmit;
/**
* 出库拣选缓存记录Mapper接口
*
* @author ruoyi
* @date 2025-07-10
*/
public interface OutPickSubmitMapper
{
/**
* 查询出库拣选缓存记录
*
* @param id 出库拣选缓存记录主键
* @return 出库拣选缓存记录
*/
public OutPickSubmit selectOutPickSubmitById(Long id);
/**
* 查询出库拣选缓存记录列表
*
* @param outPickSubmit 出库拣选缓存记录
* @return 出库拣选缓存记录集合
*/
public List<OutPickSubmit> selectOutPickSubmitList(OutPickSubmit outPickSubmit);
/**
* 新增出库拣选缓存记录
*
* @param outPickSubmit 出库拣选缓存记录
* @return 结果
*/
public int insertOutPickSubmit(OutPickSubmit outPickSubmit);
/**
* 修改出库拣选缓存记录
*
* @param outPickSubmit 出库拣选缓存记录
* @return 结果
*/
public int updateOutPickSubmit(OutPickSubmit outPickSubmit);
/**
* 删除出库拣选缓存记录
*
* @param id 出库拣选缓存记录主键
* @return 结果
*/
public int deleteOutPickSubmitById(Long id);
/**
* 批量删除出库拣选缓存记录
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteOutPickSubmitByIds(Long[] ids);
}

61
ruoyi-admin/src/main/java/com/ruoyi/out/submit/service/IOutPickSubmitService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.out.submit.service;
import java.util.List;
import com.ruoyi.out.submit.domain.OutPickSubmit;
/**
* 出库拣选缓存记录Service接口
*
* @author ruoyi
* @date 2025-07-10
*/
public interface IOutPickSubmitService
{
/**
* 查询出库拣选缓存记录
*
* @param id 出库拣选缓存记录主键
* @return 出库拣选缓存记录
*/
public OutPickSubmit selectOutPickSubmitById(Long id);
/**
* 查询出库拣选缓存记录列表
*
* @param outPickSubmit 出库拣选缓存记录
* @return 出库拣选缓存记录集合
*/
public List<OutPickSubmit> selectOutPickSubmitList(OutPickSubmit outPickSubmit);
/**
* 新增出库拣选缓存记录
*
* @param outPickSubmit 出库拣选缓存记录
* @return 结果
*/
public int insertOutPickSubmit(OutPickSubmit outPickSubmit);
/**
* 修改出库拣选缓存记录
*
* @param outPickSubmit 出库拣选缓存记录
* @return 结果
*/
public int updateOutPickSubmit(OutPickSubmit outPickSubmit);
/**
* 批量删除出库拣选缓存记录
*
* @param ids 需要删除的出库拣选缓存记录主键集合
* @return 结果
*/
public int deleteOutPickSubmitByIds(Long[] ids);
/**
* 删除出库拣选缓存记录信息
*
* @param id 出库拣选缓存记录主键
* @return 结果
*/
public int deleteOutPickSubmitById(Long id);
}

93
ruoyi-admin/src/main/java/com/ruoyi/out/submit/service/impl/OutPickSubmitServiceImpl.java Normal file
View File

@@ -0,0 +1,93 @@
package com.ruoyi.out.submit.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.out.submit.mapper.OutPickSubmitMapper;
import com.ruoyi.out.submit.domain.OutPickSubmit;
import com.ruoyi.out.submit.service.IOutPickSubmitService;
/**
* 出库拣选缓存记录Service业务层处理
*
* @author ruoyi
* @date 2025-07-10
*/
@Service
public class OutPickSubmitServiceImpl implements IOutPickSubmitService
{
@Autowired
private OutPickSubmitMapper outPickSubmitMapper;
/**
* 查询出库拣选缓存记录
*
* @param id 出库拣选缓存记录主键
* @return 出库拣选缓存记录
*/
@Override
public OutPickSubmit selectOutPickSubmitById(Long id)
{
return outPickSubmitMapper.selectOutPickSubmitById(id);
}
/**
* 查询出库拣选缓存记录列表
*
* @param outPickSubmit 出库拣选缓存记录
* @return 出库拣选缓存记录
*/
@Override
public List<OutPickSubmit> selectOutPickSubmitList(OutPickSubmit outPickSubmit)
{
return outPickSubmitMapper.selectOutPickSubmitList(outPickSubmit);
}
/**
* 新增出库拣选缓存记录
*
* @param outPickSubmit 出库拣选缓存记录
* @return 结果
*/
@Override
public int insertOutPickSubmit(OutPickSubmit outPickSubmit)
{
return outPickSubmitMapper.insertOutPickSubmit(outPickSubmit);
}
/**
* 修改出库拣选缓存记录
*
* @param outPickSubmit 出库拣选缓存记录
* @return 结果
*/
@Override
public int updateOutPickSubmit(OutPickSubmit outPickSubmit)
{
return outPickSubmitMapper.updateOutPickSubmit(outPickSubmit);
}
/**
* 批量删除出库拣选缓存记录
*
* @param ids 需要删除的出库拣选缓存记录主键
* @return 结果
*/
@Override
public int deleteOutPickSubmitByIds(Long[] ids)
{
return outPickSubmitMapper.deleteOutPickSubmitByIds(ids);
}
/**
* 删除出库拣选缓存记录信息
*
* @param id 出库拣选缓存记录主键
* @return 结果
*/
@Override
public int deleteOutPickSubmitById(Long id)
{
return outPickSubmitMapper.deleteOutPickSubmitById(id);
}
}

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

@@ -73,7 +73,6 @@ public class PdaController extends BaseController {
*/
@RequestMapping("/emptyTrayIn")
@ResponseBody
@Log(title = "空托盘入库", businessType = BusinessType.INSERT)
public AjaxResult emptyTrayIn(@RequestBody TrayCodeMsg trayCodeMsg) {
BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId());
if (basWarehouse == null) {
@@ -87,7 +86,7 @@ public class PdaController extends BaseController {
basCargoSpace.setWarehouseId(trayCodeMsg.getWarehouseId());
basCargoSpace.setStatus("1");
List<BasCargoSpace> basCargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(basCargoSpace);
if (basCargoSpaces.size() == 0) {
if (basCargoSpaces.isEmpty()) {
return AjaxResult.error("此仓库没有空余货位");
} else {
trayCodeMsg.setCargoSpaceId(basCargoSpaces.get(0).getCargoSpaceId());
@@ -122,7 +121,7 @@ public class PdaController extends BaseController {
basStock.setWarehouseId(warehouseId);
List<BasStock> basStockList = basStockService.selectKtpStock(basStock);
if (basStockList.size() != 0) {
if (!basStockList.isEmpty()) {
return AjaxResult.success(basStockList);
} else {
return AjaxResult.error("此区域没有空托盘库存");
@@ -306,7 +305,7 @@ public class PdaController extends BaseController {
public AjaxResult taskList(@RequestBody TrayCodeMsg trayCodeMsg) {
List<BasWarehouse> basWarehouses = basWarehouseService.selectBasWarehouseList(new BasWarehouse());
List<MydoJob> mydoJobArrayList = new ArrayList<>();
if(basWarehouses.size() != 0){
if(!basWarehouses.isEmpty()){
for(BasWarehouse basWarehouse : basWarehouses){
@@ -356,7 +355,7 @@ public class PdaController extends BaseController {
mydoJob.setTrayCode(trayCodeMsg.getTrayCode());
mydoJob.setStatus(trayCodeMsg.getStatus());
List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(mydoJob);
if(mydoJobs.size() == 0){
if(mydoJobs.isEmpty()){
return AjaxResult.error("此托盘没有作业");
}
MydoJobDetail mydoJobDetail = new MydoJobDetail();
@@ -407,5 +406,16 @@ public class PdaController extends BaseController {
}
/**
* 绑定料架
* @param trayCodeMakeSure
* @return
*/
@PostMapping("/bindContainer")
@ResponseBody
public AjaxResult bindContainer(@RequestBody TrayCodeMakeSure trayCodeMakeSure) {
return pdaService.bindContainer(trayCodeMakeSure);
}
}

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

@@ -35,4 +35,6 @@ public interface PdaService {
AjaxResult outException(TrayCodeMakeSure trayCodeMakeSure);
AjaxResult agvRequest(BasContainer basContainer);
AjaxResult bindContainer(TrayCodeMakeSure trayCodeMakeSure);
}

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

@@ -26,6 +26,8 @@ import com.ruoyi.out.outStockout.domain.OutStockout;
import com.ruoyi.out.outStockout.service.IOutStockoutService;
import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
import com.ruoyi.out.submit.domain.OutPickSubmit;
import com.ruoyi.out.submit.service.IOutPickSubmitService;
import com.ruoyi.pda.domain.TrayCodeMakeSure;
import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.mapper.PdaMapper;
@@ -76,6 +78,8 @@ public class PdaServiceImp implements PdaService {
private BasProductPortMapper basProductPortMapper;
@Autowired
private IBasStockService basStockService;
@Autowired
private IOutPickSubmitService outPickSubmitService;
/**
* 空托盘入库
@@ -304,22 +308,26 @@ public class PdaServiceImp implements PdaService {
mydoJobDetailOld.setPickQuantity(oldPickQuantity.add(newPickQuantity).toString());
mydoJobDetailService.updateMydoJobDetail(mydoJobDetailOld);
//绑定容器
BasContainerDetails basContainerDetailsParam = new BasContainerDetails();
basContainerDetailsParam.setContainerId(trayCodeMakeSure.getContainerCode());
basContainerDetailsParam.setProductId(mydoJobDetailOld.getProductId());
List<BasContainerDetails> basContainerDetails = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetailsParam);
if (CollUtil.isNotEmpty(basContainerDetails)){
BasContainerDetails oldBasContainerDetails = basContainerDetails.get(0);
oldBasContainerDetails.setQuantity(oldBasContainerDetails.getQuantity()+Convert.toLong(mydoJobDetail.getPickQuantity()));
basContainerDetailsService.updateBasContainerDetails(oldBasContainerDetails);
OutPickSubmit outPickSubmitParam = new OutPickSubmit();
//outPickSubmitParam.setJobId(mydoJob.getJobId());
//outPickSubmitParam.setJobDetailId(mydoJobDetail.getJobDetailId());
outPickSubmitParam.setTrayCode(trayCodeMakeSure.getTrayCode());
List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
if (outPickSubmits.isEmpty()){
//存入中间表
OutPickSubmit outPickSubmit = new OutPickSubmit();
outPickSubmit.setJobId(mydoJob.getJobId());
outPickSubmit.setJobDetailId(mydoJobDetail.getJobDetailId());
outPickSubmit.setProductId(mydoJobDetail.getProductId());
outPickSubmit.setQuantit(mydoJobDetail.getPickQuantity());
outPickSubmit.setTrayCode(trayCodeMakeSure.getTrayCode());
outPickSubmitService.insertOutPickSubmit(outPickSubmit);
}else {
BasContainerDetails newBasContainerDetails = new BasContainerDetails();
newBasContainerDetails.setContainerId(trayCodeMakeSure.getContainerCode());
newBasContainerDetails.setProductId(mydoJobDetail.getProductId());
newBasContainerDetails.setQuantity(Convert.toLong(mydoJobDetail.getPickQuantity()));
basContainerDetailsService.insertBasContainerDetails(newBasContainerDetails);
OutPickSubmit oldOutPickSubmit = outPickSubmits.get(0);
oldOutPickSubmit.setQuantit(Convert.toBigDecimal(oldOutPickSubmit.getQuantit()).add(Convert.toBigDecimal(mydoJobDetail.getPickQuantity())).toString());
outPickSubmitService.updateOutPickSubmit(oldOutPickSubmit);
}
//bindContainer(trayCodeMakeSure, mydoJobDetail, mydoJobDetailOld);
//修改单据实际数量
String inOrOutDId = mydoJobDetailOld.getInOrOutDId();
@@ -349,6 +357,8 @@ public class PdaServiceImp implements PdaService {
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) {
@@ -485,4 +495,52 @@ public class PdaServiceImp implements PdaService {
return null;
}
@Override
public AjaxResult bindContainer(TrayCodeMakeSure trayCodeMakeSure) {
if (CollUtil.isEmpty(trayCodeMakeSure.getMydoJobDetailList())){
return AjaxResult.warn("请选择提供绑定数量");
}
if (StrUtil.isEmpty(trayCodeMakeSure.getContainerCode())){
return AjaxResult.warn("请选择绑定容器");
}
for (MydoJobDetail mydoJobDetail : trayCodeMakeSure.getMydoJobDetailList()) {
//绑定容器
BasContainerDetails basContainerDetailsParam = new BasContainerDetails();
basContainerDetailsParam.setContainerId(trayCodeMakeSure.getContainerCode());
basContainerDetailsParam.setProductId(mydoJobDetail.getProductId());
List<BasContainerDetails> basContainerDetails = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetailsParam);
if (CollUtil.isNotEmpty(basContainerDetails)){
BasContainerDetails oldBasContainerDetails = basContainerDetails.get(0);
oldBasContainerDetails.setQuantity(oldBasContainerDetails.getQuantity()+Convert.toLong(mydoJobDetail.getPickBindQuantity()));
basContainerDetailsService.updateBasContainerDetails(oldBasContainerDetails);
}else {
BasContainerDetails newBasContainerDetails = new BasContainerDetails();
newBasContainerDetails.setContainerId(trayCodeMakeSure.getContainerCode());
newBasContainerDetails.setProductId(mydoJobDetail.getProductId());
newBasContainerDetails.setQuantity(Convert.toLong(mydoJobDetail.getPickBindQuantity()));
basContainerDetailsService.insertBasContainerDetails(newBasContainerDetails);
}
//减少中间表数量
OutPickSubmit outPickSubmitParam = new OutPickSubmit();
//outPickSubmitParam.setJobId(mydoJobDetail.getJobId());
//outPickSubmitParam.setJobDetailId(mydoJobDetail.getJobDetailId());
outPickSubmitParam.setTrayCode(trayCodeMakeSure.getTrayCode());
List<OutPickSubmit> outPickSubmits = outPickSubmitService.selectOutPickSubmitList(outPickSubmitParam);
for (OutPickSubmit outPickSubmit : outPickSubmits) {
BigDecimal subtract = Convert.toBigDecimal(outPickSubmit.getQuantit()).subtract(Convert.toBigDecimal(mydoJobDetail.getPickBindQuantity()));
if (subtract.compareTo(BigDecimal.ZERO) == 0){
//删除缓存信息
outPickSubmitService.deleteOutPickSubmitById(outPickSubmit.getId());
}else if (subtract.compareTo(BigDecimal.ZERO) < 0){
return AjaxResult.warn("绑定数量不能大于实际数量");
}else {
outPickSubmit.setQuantit(subtract.toString());
outPickSubmitService.updateOutPickSubmit(outPickSubmit);
}
}
}
return AjaxResult.success("绑定成功");
}
}

76
ruoyi-admin/src/main/resources/mapper/out/OutPickSubmitMapper.xml Normal file
View File

@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.out.submit.mapper.OutPickSubmitMapper">
<resultMap type="OutPickSubmit" id="OutPickSubmitResult">
<result property="id" column="id" />
<result property="trayCode" column="tray_code" />
<result property="jobId" column="job_id" />
<result property="jobDetailId" column="job_detail_id" />
<result property="productId" column="product_id" />
<result property="quantit" column="quantit" />
</resultMap>
<sql id="selectOutPickSubmitVo">
select id, tray_code, job_id, job_detail_id, product_id, quantit from out_pick_submit
</sql>
<select id="selectOutPickSubmitList" parameterType="OutPickSubmit" resultMap="OutPickSubmitResult">
<include refid="selectOutPickSubmitVo"/>
<where>
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="jobDetailId != null and jobDetailId != ''"> and job_detail_id = #{jobDetailId}</if>
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
<if test="quantit != null and quantit != ''"> and quantit = #{quantit}</if>
</where>
</select>
<select id="selectOutPickSubmitById" parameterType="Long" resultMap="OutPickSubmitResult">
<include refid="selectOutPickSubmitVo"/>
where id = #{id}
</select>
<insert id="insertOutPickSubmit" parameterType="OutPickSubmit" useGeneratedKeys="true" keyProperty="id">
insert into out_pick_submit
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="trayCode != null">tray_code,</if>
<if test="jobId != null">job_id,</if>
<if test="jobDetailId != null">job_detail_id,</if>
<if test="productId != null">product_id,</if>
<if test="quantit != null">quantit,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="trayCode != null">#{trayCode},</if>
<if test="jobId != null">#{jobId},</if>
<if test="jobDetailId != null">#{jobDetailId},</if>
<if test="productId != null">#{productId},</if>
<if test="quantit != null">#{quantit},</if>
</trim>
</insert>
<update id="updateOutPickSubmit" parameterType="OutPickSubmit">
update out_pick_submit
<trim prefix="SET" suffixOverrides=",">
<if test="trayCode != null">tray_code = #{trayCode},</if>
<if test="jobId != null">job_id = #{jobId},</if>
<if test="jobDetailId != null">job_detail_id = #{jobDetailId},</if>
<if test="productId != null">product_id = #{productId},</if>
<if test="quantit != null">quantit = #{quantit},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteOutPickSubmitById" parameterType="Long">
delete from out_pick_submit where id = #{id}
</delete>
<delete id="deleteOutPickSubmitByIds" parameterType="String">
delete from out_pick_submit where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

121
ruoyi-admin/src/main/resources/mapper/requestInterface/RequestLogMapper.xml Normal file
View File

@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.log.mapper.RequestLogMapper">
<resultMap type="RequestLog" id="RequestLogResult">
<result property="requestId" column="request_id" />
<result property="requestTime" column="request_time" />
<result property="sourceSystem" column="source_system" />
<result property="targetSystem" column="target_system" />
<result property="endpoint" column="endpoint" />
<result property="requestUrl" column="request_url" />
<result property="requestMethod" column="request_method" />
<result property="requestHeaders" column="request_headers" />
<result property="requestBody" column="request_body" />
<result property="responseTime" column="response_time" />
<result property="responseBody" column="response_body" />
<result property="responseStatus" column="response_status" />
<result property="errorDetails" column="error_details" />
<result property="duration" column="duration" />
<result property="isSuccessful" column="Is_successful" />
</resultMap>
<sql id="selectRequestLogVo">
select request_id, request_time, source_system, target_system, endpoint, request_url, request_method, request_headers, request_body, response_time, response_body, response_status, error_details, duration, Is_successful from request_log
</sql>
<select id="selectRequestLogList" parameterType="RequestLog" resultMap="RequestLogResult">
<include refid="selectRequestLogVo"/>
<where>
<if test="requestTime != null and requestTime != ''"> and request_time = #{requestTime}</if>
<if test="sourceSystem != null and sourceSystem != ''"> and source_system = #{sourceSystem}</if>
<if test="targetSystem != null and targetSystem != ''"> and target_system = #{targetSystem}</if>
<if test="endpoint != null and endpoint != ''"> and endpoint = #{endpoint}</if>
<if test="requestUrl != null and requestUrl != ''"> and request_url = #{requestUrl}</if>
<if test="requestMethod != null and requestMethod != ''"> and request_method = #{requestMethod}</if>
<if test="requestHeaders != null and requestHeaders != ''"> and request_headers = #{requestHeaders}</if>
<if test="requestBody != null and requestBody != ''"> and request_body = #{requestBody}</if>
<if test="responseTime != null and responseTime != ''"> and response_time = #{responseTime}</if>
<if test="responseBody != null and responseBody != ''"> and response_body = #{responseBody}</if>
<if test="responseStatus != null and responseStatus != ''"> and response_status = #{responseStatus}</if>
<if test="errorDetails != null and errorDetails != ''"> and error_details = #{errorDetails}</if>
<if test="duration != null and duration != ''"> and duration = #{duration}</if>
<if test="isSuccessful != null and isSuccessful != ''"> and Is_successful = #{isSuccessful}</if>
</where>
</select>
<select id="selectRequestLogByRequestId" parameterType="Long" resultMap="RequestLogResult">
<include refid="selectRequestLogVo"/>
where request_id = #{requestId}
</select>
<insert id="insertRequestLog" parameterType="RequestLog" useGeneratedKeys="true" keyProperty="requestId">
insert into request_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="requestTime != null">request_time,</if>
<if test="sourceSystem != null">source_system,</if>
<if test="targetSystem != null">target_system,</if>
<if test="endpoint != null">endpoint,</if>
<if test="requestUrl != null">request_url,</if>
<if test="requestMethod != null">request_method,</if>
<if test="requestHeaders != null">request_headers,</if>
<if test="requestBody != null">request_body,</if>
<if test="responseTime != null">response_time,</if>
<if test="responseBody != null">response_body,</if>
<if test="responseStatus != null">response_status,</if>
<if test="errorDetails != null">error_details,</if>
<if test="duration != null">duration,</if>
<if test="isSuccessful != null">Is_successful,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="requestTime != null">#{requestTime},</if>
<if test="sourceSystem != null">#{sourceSystem},</if>
<if test="targetSystem != null">#{targetSystem},</if>
<if test="endpoint != null">#{endpoint},</if>
<if test="requestUrl != null">#{requestUrl},</if>
<if test="requestMethod != null">#{requestMethod},</if>
<if test="requestHeaders != null">#{requestHeaders},</if>
<if test="requestBody != null">#{requestBody},</if>
<if test="responseTime != null">#{responseTime},</if>
<if test="responseBody != null">#{responseBody},</if>
<if test="responseStatus != null">#{responseStatus},</if>
<if test="errorDetails != null">#{errorDetails},</if>
<if test="duration != null">#{duration},</if>
<if test="isSuccessful != null">#{isSuccessful},</if>
</trim>
</insert>
<update id="updateRequestLog" parameterType="RequestLog">
update request_log
<trim prefix="SET" suffixOverrides=",">
<if test="requestTime != null">request_time = #{requestTime},</if>
<if test="sourceSystem != null">source_system = #{sourceSystem},</if>
<if test="targetSystem != null">target_system = #{targetSystem},</if>
<if test="endpoint != null">endpoint = #{endpoint},</if>
<if test="requestUrl != null">request_url = #{requestUrl},</if>
<if test="requestMethod != null">request_method = #{requestMethod},</if>
<if test="requestHeaders != null">request_headers = #{requestHeaders},</if>
<if test="requestBody != null">request_body = #{requestBody},</if>
<if test="responseTime != null">response_time = #{responseTime},</if>
<if test="responseBody != null">response_body = #{responseBody},</if>
<if test="responseStatus != null">response_status = #{responseStatus},</if>
<if test="errorDetails != null">error_details = #{errorDetails},</if>
<if test="duration != null">duration = #{duration},</if>
<if test="isSuccessful != null">Is_successful = #{isSuccessful},</if>
</trim>
where request_id = #{requestId}
</update>
<delete id="deleteRequestLogByRequestId" parameterType="Long">
delete from request_log where request_id = #{requestId}
</delete>
<delete id="deleteRequestLogByRequestIds" parameterType="String">
delete from request_log where request_id in
<foreach item="requestId" collection="array" open="(" separator="," close=")">
#{requestId}
</foreach>
</delete>
</mapper>