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

mes 出库单据 入库单据回传功能

Browse Source
This commit is contained in:
liuhanqing
2026-01-22 11:43:43 +08:00
parent a39c82faa6
commit d1a355f917
16 changed files with 912 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToMesApiController.java
View File

@@ -61,4 +61,9 @@ public class ToMesApiController {
/**
* 单据信息回传
*/
@GetMapping("/callBackInAndOutBill")
public AjaxResult callBackInAndOutBill() {
toMesService.callBackInAndOutBill();
return AjaxResult.success();
}
}

14
ruoyi-admin/src/main/java/com/ruoyi/api/domain/MesResponse.java Normal file
View File

@@ -0,0 +1,14 @@
package com.ruoyi.api.domain;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class MesResponse {
private Integer Code;
private String Msg;
private Object data;
}

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

@@ -29,5 +29,5 @@ public interface IToMesService {
AjaxResult receiveOutBill(OutStockoutVo outStockoutVo);
AjaxResult callBackInAndOutBill();
void callBackInAndOutBill();
}

32
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToMesServiceImpl.java
View File

@@ -1,6 +1,8 @@
package com.ruoyi.api.service.impl;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.json.JSONUtil;
import com.ruoyi.api.domain.MesResponse;
import com.ruoyi.api.service.IToMesService;
import com.ruoyi.bas.BasCustomer.domain.BasCustomer;
import com.ruoyi.bas.BasCustomer.service.IBasCustomerService;
@@ -11,12 +13,18 @@ import com.ruoyi.bas.BasSupplier.service.IBasSupplierService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.in.stockin.domain.vo.InstockInVo;
import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.log.domain.RequestLog;
import com.ruoyi.log.service.IRequestLogService;
import com.ruoyi.mes.callback.domain.MesBillCallback;
import com.ruoyi.mes.callback.service.IMesBillCallbackService;
import com.ruoyi.out.outStockout.domain.OutStockoutVo;
import com.ruoyi.out.outStockout.service.IOutStockoutService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -27,18 +35,20 @@ public class ToMesServiceImpl implements IToMesService {
@Autowired
private IBasProductService basProductService;
@Autowired
private IBasSupplierService basSupplierService;
@Autowired
private IBasCustomerService basCustomerService;
@Autowired
private IInStockinService inStockinService;
@Autowired
private IOutStockoutService outStockoutService;
@Autowired
private IMesBillCallbackService mesBillCallbackService;
@Autowired
private IRequestLogService requestLogService;
private static final String MES_BILL_CALLBACK = "http://172.16.11.93/tz/wms/aReindoc.aspx";
@Override
@@ -103,7 +113,17 @@ public class ToMesServiceImpl implements IToMesService {
}
@Override
public AjaxResult callBackInAndOutBill() {
return null;
//@Scheduled(fixedDelay = 3000)
public void callBackInAndOutBill() {
MesBillCallback param = new MesBillCallback();
param.setStatus("0");
List<MesBillCallback> mesBillCallbacks = mesBillCallbackService.selectMesBillCallbackList(param);
for (MesBillCallback mesBillCallback : mesBillCallbacks) {
RequestLog requestLog = requestLogService.getRequestLogMes(MES_BILL_CALLBACK, JSONUtil.toJsonStr(mesBillCallback), "推送出库任务");
if ("1".equals(requestLog.getIsSuccessful())){
mesBillCallback.setStatus("1");
mesBillCallbackService.updateMesBillCallback(mesBillCallback);
}
}
}
}

28
ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
View File

@@ -16,6 +16,8 @@ import com.ruoyi.in.stockin.mapper.InStockinMapper;
import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.in.stockindetail.domain.InStockinDetail;
import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
import com.ruoyi.mes.callback.domain.MesBillCallback;
import com.ruoyi.mes.callback.service.IMesBillCallbackService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -39,6 +41,8 @@ public class InStockinServiceImpl implements IInStockinService
private IInStockinDetailService iInStockinDetailService;
@Autowired
private IBasJobIdService iBasJobIdService;
@Autowired
private IMesBillCallbackService mesBillCallbackService;
/**
* 查询入库单据
@@ -185,6 +189,30 @@ public class InStockinServiceImpl implements IInStockinService
}
inStockin.setFinishDate(DateUtil.formatDateTime(DateUtil.date()));
inStockinMapper.updateInStockin(inStockin);
if ("3".equals(old.getStockSource())){
//插入MES上位系统回传表
for (InStockinDetail inStockinDetail : list) {
MesBillCallback mesBillCallback = new MesBillCallback();
mesBillCallback.setInStockinId(inStockinDetail.getStockinId());
mesBillCallback.setInStockinDetailId(inStockinDetail.getStockinDetailId());
mesBillCallback.setStatus("0");
mesBillCallback.setFrom("RK");
mesBillCallback.setStr1(old.getErpBill());
mesBillCallback.setStr2(inStockinDetail.getSpare6());
mesBillCallback.setStr3(inStockinDetail.getSpare7());
mesBillCallback.setStr4(inStockinDetail.getSpare9());
mesBillCallback.setStr5(inStockinDetail.getSpare5());
mesBillCallback.setStr6(DateUtil.format(DateUtil.date(),"yyyy/MM/dd"));
mesBillCallback.setStr7(SecurityUtils.getUsername());
mesBillCallback.setNum1(Convert.toBigDecimal(inStockinDetail.getAssignNum()));
mesBillCallbackService.insertMesBillCallback(mesBillCallback);
}
}else if ("2".equals(old.getStockSource())){
//插入ERP上位系统回传表
}
//插入历史
insertInStockinHistory(inStockin);
}
return AjaxResult.success();

1
ruoyi-admin/src/main/java/com/ruoyi/log/service/IRequestLogService.java
View File

@@ -69,6 +69,7 @@ public interface IRequestLogService
* @return
*/
public RequestLog getRequestLog(String url, String param, String remark);
public RequestLog getRequestLogMes(String url, String param, String remark);
/**
* 接收接口记录
*

50
ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.http.HttpUtil;
import cn.hutool.json.JSONUtil;
import com.ruoyi.api.domain.MesResponse;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.log.domain.RequestLog;
import com.ruoyi.log.mapper.RequestLogMapper;
@@ -62,11 +63,7 @@ public class RequestLogServiceImpl implements IRequestLogService
@Override
public int insertRequestLog(RequestLog requestLog)
{
if (requestLog.getIsSuccessful().equals("1")){
return requestLogMapper.insertRequestLog(requestLog);
}else {
return 0;
}
return requestLogMapper.insertRequestLog(requestLog);
}
/**
@@ -148,6 +145,49 @@ public class RequestLogServiceImpl implements IRequestLogService
return requestLog;
}
/**
* 插入请求日志
*
* @param url 请求url
* @param param 参数
* @return requestLog
*/
@Override
public RequestLog getRequestLogMes(String url, String param, String remark) {
RequestLog requestLog = new RequestLog();
requestLog.setRequestTime(DateUtil.formatDateTime(new Date()));
requestLog.setSourceSystem("wcs");
requestLog.setTargetSystem("mes");
requestLog.setEndpoint(remark);
requestLog.setRequestMethod("post");
requestLog.setRequestHeaders(null);
requestLog.setRequestBody(param);
requestLog.setRequestUrl(url);
try {
String resStr = HttpUtil.post(url, param);
requestLog.setResponseBody(resStr);
MesResponse bean = JSONUtil.toBean(resStr, MesResponse.class);
if (bean.getCode() == 200) {
requestLog.setResponseTime(DateUtil.formatDateTime(new Date()));
requestLog.setResponseStatus("1");
requestLog.setDuration(Convert.toStr(DateUtil.between(Convert.toDate(requestLog.getRequestTime()), Convert.toDate(requestLog.getResponseTime()), DateUnit.MS)));
requestLog.setIsSuccessful("1");
}else {
requestLog.setResponseStatus("0");
requestLog.setErrorDetails(bean.getMsg());
requestLog.setIsSuccessful("0");
}
} catch (Exception e) {
requestLog.setErrorDetails(e.getMessage());
requestLog.setIsSuccessful("0");
requestLog.setResponseStatus("0");
} finally {
insertRequestLog(requestLog);
}
return requestLog;
}
/**
* 插入请求日志
*

104
ruoyi-admin/src/main/java/com/ruoyi/mes/callback/controller/MesBillCallbackController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.mes.callback.controller;
import java.util.List;
import jakarta.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.mes.callback.domain.MesBillCallback;
import com.ruoyi.mes.callback.service.IMesBillCallbackService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* MES单据回传Controller
*
* @author ruoyi
* @date 2026-01-22
*/
@RestController
@RequestMapping("/mes/callback")
public class MesBillCallbackController extends BaseController
{
@Autowired
private IMesBillCallbackService mesBillCallbackService;
/**
* 查询MES单据回传列表
*/
@PreAuthorize("@ss.hasPermi('mes:callback:list')")
@GetMapping("/list")
public TableDataInfo list(MesBillCallback mesBillCallback)
{
startPage();
List<MesBillCallback> list = mesBillCallbackService.selectMesBillCallbackList(mesBillCallback);
return getDataTable(list);
}
/**
* 导出MES单据回传列表
*/
@PreAuthorize("@ss.hasPermi('mes:callback:export')")
@Log(title = "MES单据回传", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, MesBillCallback mesBillCallback)
{
List<MesBillCallback> list = mesBillCallbackService.selectMesBillCallbackList(mesBillCallback);
ExcelUtil<MesBillCallback> util = new ExcelUtil<MesBillCallback>(MesBillCallback.class);
util.exportExcel(response, list, "MES单据回传数据");
}
/**
* 获取MES单据回传详细信息
*/
@PreAuthorize("@ss.hasPermi('mes:callback:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(mesBillCallbackService.selectMesBillCallbackById(id));
}
/**
* 新增MES单据回传
*/
@PreAuthorize("@ss.hasPermi('mes:callback:add')")
@Log(title = "MES单据回传", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody MesBillCallback mesBillCallback)
{
return toAjax(mesBillCallbackService.insertMesBillCallback(mesBillCallback));
}
/**
* 修改MES单据回传
*/
@PreAuthorize("@ss.hasPermi('mes:callback:edit')")
@Log(title = "MES单据回传", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody MesBillCallback mesBillCallback)
{
return toAjax(mesBillCallbackService.updateMesBillCallback(mesBillCallback));
}
/**
* 删除MES单据回传
*/
@PreAuthorize("@ss.hasPermi('mes:callback:remove')")
@Log(title = "MES单据回传", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(mesBillCallbackService.deleteMesBillCallbackByIds(ids));
}
}

323
ruoyi-admin/src/main/java/com/ruoyi/mes/callback/domain/MesBillCallback.java Normal file
View File

@@ -0,0 +1,323 @@
package com.ruoyi.mes.callback.domain;
import java.math.BigDecimal;
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;
/**
* MES单据回传对象 mes_bill_callback
*
* @author ruoyi
* @date 2026-01-22
*/
public class MesBillCallback extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 主单id */
@Excel(name = "主单id")
private String inStockinId;
/** 子单id */
@Excel(name = "子单id")
private String inStockinDetailId;
/** 状态 0-未回传 1-已回传 2-回传失败 */
@Excel(name = "状态 0-未回传 1-已回传 2-回传失败")
private String status;
/** 类型 RK CK */
@Excel(name = "类型 RK CK")
private String from;
/** 上位系统单号 */
@Excel(name = "上位系统单号")
private String str1;
/** 合同号 */
@Excel(name = "合同号")
private String str2;
/** 产品号 */
@Excel(name = "产品号")
private String str3;
/** 代号 */
@Excel(name = "代号")
private String str4;
/** 台次 */
@Excel(name = "台次")
private String str5;
/** 时间 格式YYYY/MM/DD */
@Excel(name = "时间 格式YYYY/MM/DD")
private String str6;
/** 操作人 */
@Excel(name = "操作人")
private String str7;
/** 预留 */
@Excel(name = "预留")
private String str8;
/** 预留 */
@Excel(name = "预留")
private String str9;
/** 预留 */
@Excel(name = "预留")
private String str10;
/** 出入库数量 */
@Excel(name = "出入库数量")
private BigDecimal num1;
/** 预留 */
@Excel(name = "预留")
private BigDecimal num2;
/** 预留 */
@Excel(name = "预留")
private BigDecimal num3;
/** 预留 */
@Excel(name = "预留")
private BigDecimal num4;
/** 预留 */
@Excel(name = "预留")
private BigDecimal num5;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setInStockinId(String inStockinId)
{
this.inStockinId = inStockinId;
}
public String getInStockinId()
{
return inStockinId;
}
public void setInStockinDetailId(String inStockinDetailId)
{
this.inStockinDetailId = inStockinDetailId;
}
public String getInStockinDetailId()
{
return inStockinDetailId;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setFrom(String from)
{
this.from = from;
}
public String getFrom()
{
return from;
}
public void setStr1(String str1)
{
this.str1 = str1;
}
public String getStr1()
{
return str1;
}
public void setStr2(String str2)
{
this.str2 = str2;
}
public String getStr2()
{
return str2;
}
public void setStr3(String str3)
{
this.str3 = str3;
}
public String getStr3()
{
return str3;
}
public void setStr4(String str4)
{
this.str4 = str4;
}
public String getStr4()
{
return str4;
}
public void setStr5(String str5)
{
this.str5 = str5;
}
public String getStr5()
{
return str5;
}
public void setStr6(String str6)
{
this.str6 = str6;
}
public String getStr6()
{
return str6;
}
public void setStr7(String str7)
{
this.str7 = str7;
}
public String getStr7()
{
return str7;
}
public void setStr8(String str8)
{
this.str8 = str8;
}
public String getStr8()
{
return str8;
}
public void setStr9(String str9)
{
this.str9 = str9;
}
public String getStr9()
{
return str9;
}
public void setStr10(String str10)
{
this.str10 = str10;
}
public String getStr10()
{
return str10;
}
public void setNum1(BigDecimal num1)
{
this.num1 = num1;
}
public BigDecimal getNum1()
{
return num1;
}
public void setNum2(BigDecimal num2)
{
this.num2 = num2;
}
public BigDecimal getNum2()
{
return num2;
}
public void setNum3(BigDecimal num3)
{
this.num3 = num3;
}
public BigDecimal getNum3()
{
return num3;
}
public void setNum4(BigDecimal num4)
{
this.num4 = num4;
}
public BigDecimal getNum4()
{
return num4;
}
public void setNum5(BigDecimal num5)
{
this.num5 = num5;
}
public BigDecimal getNum5()
{
return num5;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("inStockinId", getInStockinId())
.append("inStockinDetailId", getInStockinDetailId())
.append("status", getStatus())
.append("from", getFrom())
.append("str1", getStr1())
.append("str2", getStr2())
.append("str3", getStr3())
.append("str4", getStr4())
.append("str5", getStr5())
.append("str6", getStr6())
.append("str7", getStr7())
.append("str8", getStr8())
.append("str9", getStr9())
.append("str10", getStr10())
.append("num1", getNum1())
.append("num2", getNum2())
.append("num3", getNum3())
.append("num4", getNum4())
.append("num5", getNum5())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/mes/callback/mapper/MesBillCallbackMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.mes.callback.mapper;
import java.util.List;
import com.ruoyi.mes.callback.domain.MesBillCallback;
/**
* MES单据回传Mapper接口
*
* @author ruoyi
* @date 2026-01-22
*/
public interface MesBillCallbackMapper
{
/**
* 查询MES单据回传
*
* @param id MES单据回传主键
* @return MES单据回传
*/
public MesBillCallback selectMesBillCallbackById(Long id);
/**
* 查询MES单据回传列表
*
* @param mesBillCallback MES单据回传
* @return MES单据回传集合
*/
public List<MesBillCallback> selectMesBillCallbackList(MesBillCallback mesBillCallback);
/**
* 新增MES单据回传
*
* @param mesBillCallback MES单据回传
* @return 结果
*/
public int insertMesBillCallback(MesBillCallback mesBillCallback);
/**
* 修改MES单据回传
*
* @param mesBillCallback MES单据回传
* @return 结果
*/
public int updateMesBillCallback(MesBillCallback mesBillCallback);
/**
* 删除MES单据回传
*
* @param id MES单据回传主键
* @return 结果
*/
public int deleteMesBillCallbackById(Long id);
/**
* 批量删除MES单据回传
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteMesBillCallbackByIds(Long[] ids);
}

61
ruoyi-admin/src/main/java/com/ruoyi/mes/callback/service/IMesBillCallbackService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.mes.callback.service;
import java.util.List;
import com.ruoyi.mes.callback.domain.MesBillCallback;
/**
* MES单据回传Service接口
*
* @author ruoyi
* @date 2026-01-22
*/
public interface IMesBillCallbackService
{
/**
* 查询MES单据回传
*
* @param id MES单据回传主键
* @return MES单据回传
*/
public MesBillCallback selectMesBillCallbackById(Long id);
/**
* 查询MES单据回传列表
*
* @param mesBillCallback MES单据回传
* @return MES单据回传集合
*/
public List<MesBillCallback> selectMesBillCallbackList(MesBillCallback mesBillCallback);
/**
* 新增MES单据回传
*
* @param mesBillCallback MES单据回传
* @return 结果
*/
public int insertMesBillCallback(MesBillCallback mesBillCallback);
/**
* 修改MES单据回传
*
* @param mesBillCallback MES单据回传
* @return 结果
*/
public int updateMesBillCallback(MesBillCallback mesBillCallback);
/**
* 批量删除MES单据回传
*
* @param ids 需要删除的MES单据回传主键集合
* @return 结果
*/
public int deleteMesBillCallbackByIds(Long[] ids);
/**
* 删除MES单据回传信息
*
* @param id MES单据回传主键
* @return 结果
*/
public int deleteMesBillCallbackById(Long id);
}

93
ruoyi-admin/src/main/java/com/ruoyi/mes/callback/service/impl/MesBillCallbackServiceImpl.java Normal file
View File

@@ -0,0 +1,93 @@
package com.ruoyi.mes.callback.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.mes.callback.mapper.MesBillCallbackMapper;
import com.ruoyi.mes.callback.domain.MesBillCallback;
import com.ruoyi.mes.callback.service.IMesBillCallbackService;
/**
* MES单据回传Service业务层处理
*
* @author ruoyi
* @date 2026-01-22
*/
@Service
public class MesBillCallbackServiceImpl implements IMesBillCallbackService
{
@Autowired
private MesBillCallbackMapper mesBillCallbackMapper;
/**
* 查询MES单据回传
*
* @param id MES单据回传主键
* @return MES单据回传
*/
@Override
public MesBillCallback selectMesBillCallbackById(Long id)
{
return mesBillCallbackMapper.selectMesBillCallbackById(id);
}
/**
* 查询MES单据回传列表
*
* @param mesBillCallback MES单据回传
* @return MES单据回传
*/
@Override
public List<MesBillCallback> selectMesBillCallbackList(MesBillCallback mesBillCallback)
{
return mesBillCallbackMapper.selectMesBillCallbackList(mesBillCallback);
}
/**
* 新增MES单据回传
*
* @param mesBillCallback MES单据回传
* @return 结果
*/
@Override
public int insertMesBillCallback(MesBillCallback mesBillCallback)
{
return mesBillCallbackMapper.insertMesBillCallback(mesBillCallback);
}
/**
* 修改MES单据回传
*
* @param mesBillCallback MES单据回传
* @return 结果
*/
@Override
public int updateMesBillCallback(MesBillCallback mesBillCallback)
{
return mesBillCallbackMapper.updateMesBillCallback(mesBillCallback);
}
/**
* 批量删除MES单据回传
*
* @param ids 需要删除的MES单据回传主键
* @return 结果
*/
@Override
public int deleteMesBillCallbackByIds(Long[] ids)
{
return mesBillCallbackMapper.deleteMesBillCallbackByIds(ids);
}
/**
* 删除MES单据回传信息
*
* @param id MES单据回传主键
* @return 结果
*/
@Override
public int deleteMesBillCallbackById(Long id)
{
return mesBillCallbackMapper.deleteMesBillCallbackById(id);
}
}

1
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/service/impl/OutStockoutServiceImpl.java
View File

@@ -168,6 +168,7 @@ public class OutStockoutServiceImpl implements IOutStockoutService {
map.put("status", status);
map.put("newStatus", newStatus);
map.put("exitId", exitId);
map.put("userName", SecurityUtils.getUsername());
outStockoutMapper.updateOutStockoutStatus(map);
stringBuilder.append(",").append(map.get("v_resultString"));
}

146
ruoyi-admin/src/main/resources/mapper/mes/MesBillCallbackMapper.xml Normal file
View File

@@ -0,0 +1,146 @@
<?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.mes.callback.mapper.MesBillCallbackMapper">
<resultMap type="MesBillCallback" id="MesBillCallbackResult">
<result property="id" column="id" />
<result property="inStockinId" column="in_stockin_id" />
<result property="inStockinDetailId" column="in_stockin_detail_id" />
<result property="status" column="status" />
<result property="from" column="from" />
<result property="str1" column="str1" />
<result property="str2" column="str2" />
<result property="str3" column="str3" />
<result property="str4" column="str4" />
<result property="str5" column="str5" />
<result property="str6" column="str6" />
<result property="str7" column="str7" />
<result property="str8" column="str8" />
<result property="str9" column="str9" />
<result property="str10" column="str10" />
<result property="num1" column="num1" />
<result property="num2" column="num2" />
<result property="num3" column="num3" />
<result property="num4" column="num4" />
<result property="num5" column="num5" />
</resultMap>
<sql id="selectMesBillCallbackVo">
select id, in_stockin_id, in_stockin_detail_id, status, [from], str1, str2, str3, str4, str5, str6, str7, str8, str9, str10, num1, num2, num3, num4, num5 from mes_bill_callback
</sql>
<select id="selectMesBillCallbackList" parameterType="MesBillCallback" resultMap="MesBillCallbackResult">
<include refid="selectMesBillCallbackVo"/>
<where>
<if test="inStockinId != null and inStockinId != ''"> and in_stockin_id = #{inStockinId}</if>
<if test="inStockinDetailId != null and inStockinDetailId != ''"> and in_stockin_detail_id = #{inStockinDetailId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="from != null and from != ''"> and [from] = #{from}</if>
<if test="str1 != null and str1 != ''"> and str1 = #{str1}</if>
<if test="str2 != null and str2 != ''"> and str2 = #{str2}</if>
<if test="str3 != null and str3 != ''"> and str3 = #{str3}</if>
<if test="str4 != null and str4 != ''"> and str4 = #{str4}</if>
<if test="str5 != null and str5 != ''"> and str5 = #{str5}</if>
<if test="str6 != null and str6 != ''"> and str6 = #{str6}</if>
<if test="str7 != null and str7 != ''"> and str7 = #{str7}</if>
<if test="str8 != null and str8 != ''"> and str8 = #{str8}</if>
<if test="str9 != null and str9 != ''"> and str9 = #{str9}</if>
<if test="str10 != null and str10 != ''"> and str10 = #{str10}</if>
<if test="num1 != null "> and num1 = #{num1}</if>
<if test="num2 != null "> and num2 = #{num2}</if>
<if test="num3 != null "> and num3 = #{num3}</if>
<if test="num4 != null "> and num4 = #{num4}</if>
<if test="num5 != null "> and num5 = #{num5}</if>
</where>
</select>
<select id="selectMesBillCallbackById" parameterType="Long" resultMap="MesBillCallbackResult">
<include refid="selectMesBillCallbackVo"/>
where id = #{id}
</select>
<insert id="insertMesBillCallback" parameterType="MesBillCallback" useGeneratedKeys="true" keyProperty="id">
insert into mes_bill_callback
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="inStockinId != null">in_stockin_id,</if>
<if test="inStockinDetailId != null">in_stockin_detail_id,</if>
<if test="status != null">status,</if>
<if test="from != null">[from],</if>
<if test="str1 != null">str1,</if>
<if test="str2 != null">str2,</if>
<if test="str3 != null">str3,</if>
<if test="str4 != null">str4,</if>
<if test="str5 != null">str5,</if>
<if test="str6 != null">str6,</if>
<if test="str7 != null">str7,</if>
<if test="str8 != null">str8,</if>
<if test="str9 != null">str9,</if>
<if test="str10 != null">str10,</if>
<if test="num1 != null">num1,</if>
<if test="num2 != null">num2,</if>
<if test="num3 != null">num3,</if>
<if test="num4 != null">num4,</if>
<if test="num5 != null">num5,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="inStockinId != null">#{inStockinId},</if>
<if test="inStockinDetailId != null">#{inStockinDetailId},</if>
<if test="status != null">#{status},</if>
<if test="from != null">#{from},</if>
<if test="str1 != null">#{str1},</if>
<if test="str2 != null">#{str2},</if>
<if test="str3 != null">#{str3},</if>
<if test="str4 != null">#{str4},</if>
<if test="str5 != null">#{str5},</if>
<if test="str6 != null">#{str6},</if>
<if test="str7 != null">#{str7},</if>
<if test="str8 != null">#{str8},</if>
<if test="str9 != null">#{str9},</if>
<if test="str10 != null">#{str10},</if>
<if test="num1 != null">#{num1},</if>
<if test="num2 != null">#{num2},</if>
<if test="num3 != null">#{num3},</if>
<if test="num4 != null">#{num4},</if>
<if test="num5 != null">#{num5},</if>
</trim>
</insert>
<update id="updateMesBillCallback" parameterType="MesBillCallback">
update mes_bill_callback
<trim prefix="SET" suffixOverrides=",">
<if test="inStockinId != null">in_stockin_id = #{inStockinId},</if>
<if test="inStockinDetailId != null">in_stockin_detail_id = #{inStockinDetailId},</if>
<if test="status != null">status = #{status},</if>
<if test="from != null">[from] = #{from},</if>
<if test="str1 != null">str1 = #{str1},</if>
<if test="str2 != null">str2 = #{str2},</if>
<if test="str3 != null">str3 = #{str3},</if>
<if test="str4 != null">str4 = #{str4},</if>
<if test="str5 != null">str5 = #{str5},</if>
<if test="str6 != null">str6 = #{str6},</if>
<if test="str7 != null">str7 = #{str7},</if>
<if test="str8 != null">str8 = #{str8},</if>
<if test="str9 != null">str9 = #{str9},</if>
<if test="str10 != null">str10 = #{str10},</if>
<if test="num1 != null">num1 = #{num1},</if>
<if test="num2 != null">num2 = #{num2},</if>
<if test="num3 != null">num3 = #{num3},</if>
<if test="num4 != null">num4 = #{num4},</if>
<if test="num5 != null">num5 = #{num5},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteMesBillCallbackById" parameterType="Long">
delete from mes_bill_callback where id = #{id}
</delete>
<delete id="deleteMesBillCallbackByIds" parameterType="String">
delete from mes_bill_callback where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

1
ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
View File

@@ -154,6 +154,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{status,mode=IN,jdbcType=VARCHAR},
#{newStatus,mode=IN,jdbcType=VARCHAR},
#{exitId,mode=IN,jdbcType=VARCHAR},
#{userName,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=VARCHAR},
#{v_resultString,mode=OUT,jdbcType=VARCHAR}
)

4
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -288,7 +288,7 @@
</el-input>
</el-form-item>
<el-form-item label="货位" prop="cargoSpaceId"> <!-- 货位 -->
<!-- <el-form-item label="货位" prop="cargoSpaceId"> &lt;!&ndash; 货位 &ndash;&gt;
<el-input
v-model="form.cargoSpaceName"
placeholder="请选择货位"
@@ -300,7 +300,7 @@
<el-button icon="el-icon-search" @click="openCargoSpaceSelect"></el-button>
</template>
</el-input>
</el-form-item>
</el-form-item>-->
<el-form-item label="库存状态" prop="stockStatus"> <!-- 库存状态 -->