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

未提交的文件

Browse Source
This commit is contained in:
liuhanqing
2025-09-17 11:34:52 +08:00
parent f3bb3efe58
commit 3ccbef0ea0
8 changed files with 583 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,14 +230,15 @@ public class ToWmsServiceImpl implements IToWmsService {
basCargoSpace.setStatus("3");
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//存入调拨单数据 已生成
TransferBillCallback transferBillCallback = new TransferBillCallback();
transferBillCallback.setJobId(mydoJob.getJobId());
transferBillCallback.setErpBill(erpBill);
transferBillCallback.setType("1");
transferBillCallback.setStatus("1");
transferBillCallbackService.insertTransferBillCallback(transferBillCallback);
if ("1".equals(mydoJob.getInOrOut())){
//存入调拨单数据 已生成
TransferBillCallback transferBillCallback = new TransferBillCallback();
transferBillCallback.setJobId(mydoJob.getJobId());
transferBillCallback.setErpBill(erpBill);
transferBillCallback.setType("1");
transferBillCallback.setStatus("1");
transferBillCallbackService.insertTransferBillCallback(transferBillCallback);
}
return AjaxResult.success();
}

104
ruoyi-admin/src/main/java/com/ruoyi/in/erp/controller/TransferBillCallbackController.java Normal file
View File

@@ -0,0 +1,104 @@
package com.ruoyi.in.erp.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.in.erp.domain.TransferBillCallback;
import com.ruoyi.in.erp.service.ITransferBillCallbackService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
/**
* 调拨单回传Controller
*
* @author ruoyi
* @date 2025-09-17
*/
@RestController
@RequestMapping("/in/transfer")
public class TransferBillCallbackController extends BaseController
{
@Autowired
private ITransferBillCallbackService transferBillCallbackService;
/**
* 查询调拨单回传列表
*/
@PreAuthorize("@ss.hasPermi('in:transfer:list')")
@GetMapping("/list")
public TableDataInfo list(TransferBillCallback transferBillCallback)
{
startPage();
List<TransferBillCallback> list = transferBillCallbackService.selectTransferBillCallbackList(transferBillCallback);
return getDataTable(list);
}
/**
* 导出调拨单回传列表
*/
@PreAuthorize("@ss.hasPermi('in:transfer:export')")
@Log(title = "调拨单回传", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TransferBillCallback transferBillCallback)
{
List<TransferBillCallback> list = transferBillCallbackService.selectTransferBillCallbackList(transferBillCallback);
ExcelUtil<TransferBillCallback> util = new ExcelUtil<TransferBillCallback>(TransferBillCallback.class);
util.exportExcel(response, list, "调拨单回传数据");
}
/**
* 获取调拨单回传详细信息
*/
@PreAuthorize("@ss.hasPermi('in:transfer:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(transferBillCallbackService.selectTransferBillCallbackById(id));
}
/**
* 新增调拨单回传
*/
@PreAuthorize("@ss.hasPermi('in:transfer:add')")
@Log(title = "调拨单回传", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TransferBillCallback transferBillCallback)
{
return toAjax(transferBillCallbackService.insertTransferBillCallback(transferBillCallback));
}
/**
* 修改调拨单回传
*/
@PreAuthorize("@ss.hasPermi('in:transfer:edit')")
@Log(title = "调拨单回传", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TransferBillCallback transferBillCallback)
{
return toAjax(transferBillCallbackService.updateTransferBillCallback(transferBillCallback));
}
/**
* 删除调拨单回传
*/
@PreAuthorize("@ss.hasPermi('in:transfer:remove')")
@Log(title = "调拨单回传", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(transferBillCallbackService.deleteTransferBillCallbackByIds(ids));
}
}

158
ruoyi-admin/src/main/java/com/ruoyi/in/erp/domain/TransferBillCallback.java Normal file
View File

@@ -0,0 +1,158 @@
package com.ruoyi.in.erp.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;
/**
* 调拨单回传对象 transfer_bill_callback
*
* @author ruoyi
* @date 2025-09-17
*/
public class TransferBillCallback extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** */
private Long id;
/** mydoJob任务号 */
@Excel(name = "mydoJob任务号")
private String jobId;
/** 入库单号/订单号 */
@Excel(name = "入库单号/订单号")
private String erpBill;
/** 单据类型 */
@Excel(name = "单据类型")
private String type;
/** 状态 0-生成 1-生成 2-任务完成 3-审核 */
@Excel(name = "状态 0-生成 1-生成 2-任务完成 3-审核")
private String status;
/** 完成时间 */
@Excel(name = "完成时间")
private String finishTime;
/** 备用字段1 */
@Excel(name = "备用字段1")
private String spare1;
/** 备用字段2 */
@Excel(name = "备用字段2")
private String spare2;
/** 备用字段3 */
@Excel(name = "备用字段3")
private String spare3;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setJobId(String jobId)
{
this.jobId = jobId;
}
public String getJobId()
{
return jobId;
}
public void setErpBill(String erpBill)
{
this.erpBill = erpBill;
}
public String getErpBill()
{
return erpBill;
}
public void setType(String type)
{
this.type = type;
}
public String getType()
{
return type;
}
public void setStatus(String status)
{
this.status = status;
}
public String getStatus()
{
return status;
}
public void setFinishTime(String finishTime)
{
this.finishTime = finishTime;
}
public String getFinishTime()
{
return finishTime;
}
public void setSpare1(String spare1)
{
this.spare1 = spare1;
}
public String getSpare1()
{
return spare1;
}
public void setSpare2(String spare2)
{
this.spare2 = spare2;
}
public String getSpare2()
{
return spare2;
}
public void setSpare3(String spare3)
{
this.spare3 = spare3;
}
public String getSpare3()
{
return spare3;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("jobId", getJobId())
.append("erpBill", getErpBill())
.append("type", getType())
.append("status", getStatus())
.append("createTime", getCreateTime())
.append("finishTime", getFinishTime())
.append("spare1", getSpare1())
.append("spare2", getSpare2())
.append("spare3", getSpare3())
.toString();
}
}

61
ruoyi-admin/src/main/java/com/ruoyi/in/erp/mapper/TransferBillCallbackMapper.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.in.erp.mapper;
import java.util.List;
import com.ruoyi.in.erp.domain.TransferBillCallback;
/**
* 调拨单回传Mapper接口
*
* @author ruoyi
* @date 2025-09-17
*/
public interface TransferBillCallbackMapper
{
/**
* 查询调拨单回传
*
* @param id 调拨单回传主键
* @return 调拨单回传
*/
public TransferBillCallback selectTransferBillCallbackById(Long id);
/**
* 查询调拨单回传列表
*
* @param transferBillCallback 调拨单回传
* @return 调拨单回传集合
*/
public List<TransferBillCallback> selectTransferBillCallbackList(TransferBillCallback transferBillCallback);
/**
* 新增调拨单回传
*
* @param transferBillCallback 调拨单回传
* @return 结果
*/
public int insertTransferBillCallback(TransferBillCallback transferBillCallback);
/**
* 修改调拨单回传
*
* @param transferBillCallback 调拨单回传
* @return 结果
*/
public int updateTransferBillCallback(TransferBillCallback transferBillCallback);
/**
* 删除调拨单回传
*
* @param id 调拨单回传主键
* @return 结果
*/
public int deleteTransferBillCallbackById(Long id);
/**
* 批量删除调拨单回传
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteTransferBillCallbackByIds(Long[] ids);
}

61
ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/ITransferBillCallbackService.java Normal file
View File

@@ -0,0 +1,61 @@
package com.ruoyi.in.erp.service;
import java.util.List;
import com.ruoyi.in.erp.domain.TransferBillCallback;
/**
* 调拨单回传Service接口
*
* @author ruoyi
* @date 2025-09-17
*/
public interface ITransferBillCallbackService
{
/**
* 查询调拨单回传
*
* @param id 调拨单回传主键
* @return 调拨单回传
*/
public TransferBillCallback selectTransferBillCallbackById(Long id);
/**
* 查询调拨单回传列表
*
* @param transferBillCallback 调拨单回传
* @return 调拨单回传集合
*/
public List<TransferBillCallback> selectTransferBillCallbackList(TransferBillCallback transferBillCallback);
/**
* 新增调拨单回传
*
* @param transferBillCallback 调拨单回传
* @return 结果
*/
public int insertTransferBillCallback(TransferBillCallback transferBillCallback);
/**
* 修改调拨单回传
*
* @param transferBillCallback 调拨单回传
* @return 结果
*/
public int updateTransferBillCallback(TransferBillCallback transferBillCallback);
/**
* 批量删除调拨单回传
*
* @param ids 需要删除的调拨单回传主键集合
* @return 结果
*/
public int deleteTransferBillCallbackByIds(Long[] ids);
/**
* 删除调拨单回传信息
*
* @param id 调拨单回传主键
* @return 结果
*/
public int deleteTransferBillCallbackById(Long id);
}

95
ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/TransferBillCallbackServiceImpl.java Normal file
View File

@@ -0,0 +1,95 @@
package com.ruoyi.in.erp.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.in.erp.mapper.TransferBillCallbackMapper;
import com.ruoyi.in.erp.domain.TransferBillCallback;
import com.ruoyi.in.erp.service.ITransferBillCallbackService;
/**
* 调拨单回传Service业务层处理
*
* @author ruoyi
* @date 2025-09-17
*/
@Service
public class TransferBillCallbackServiceImpl implements ITransferBillCallbackService
{
@Autowired
private TransferBillCallbackMapper transferBillCallbackMapper;
/**
* 查询调拨单回传
*
* @param id 调拨单回传主键
* @return 调拨单回传
*/
@Override
public TransferBillCallback selectTransferBillCallbackById(Long id)
{
return transferBillCallbackMapper.selectTransferBillCallbackById(id);
}
/**
* 查询调拨单回传列表
*
* @param transferBillCallback 调拨单回传
* @return 调拨单回传
*/
@Override
public List<TransferBillCallback> selectTransferBillCallbackList(TransferBillCallback transferBillCallback)
{
return transferBillCallbackMapper.selectTransferBillCallbackList(transferBillCallback);
}
/**
* 新增调拨单回传
*
* @param transferBillCallback 调拨单回传
* @return 结果
*/
@Override
public int insertTransferBillCallback(TransferBillCallback transferBillCallback)
{
transferBillCallback.setCreateTime(DateUtils.getNowDate());
return transferBillCallbackMapper.insertTransferBillCallback(transferBillCallback);
}
/**
* 修改调拨单回传
*
* @param transferBillCallback 调拨单回传
* @return 结果
*/
@Override
public int updateTransferBillCallback(TransferBillCallback transferBillCallback)
{
return transferBillCallbackMapper.updateTransferBillCallback(transferBillCallback);
}
/**
* 批量删除调拨单回传
*
* @param ids 需要删除的调拨单回传主键
* @return 结果
*/
@Override
public int deleteTransferBillCallbackByIds(Long[] ids)
{
return transferBillCallbackMapper.deleteTransferBillCallbackByIds(ids);
}
/**
* 删除调拨单回传信息
*
* @param id 调拨单回传主键
* @return 结果
*/
@Override
public int deleteTransferBillCallbackById(Long id)
{
return transferBillCallbackMapper.deleteTransferBillCallbackById(id);
}
}

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

@@ -283,8 +283,6 @@ public class MydoJobServiceImpl implements IMydoJobService {
transferBillCallbackService.updateTransferBillCallback(transferBillCallback);
}
}
}else {
//todo 退料入库 其它入库
}
return AjaxResult.success();
} else {

95
ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml Normal file
View File

@@ -0,0 +1,95 @@
<?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.in.erp.mapper.TransferBillCallbackMapper">
<resultMap type="TransferBillCallback" id="TransferBillCallbackResult">
<result property="id" column="id" />
<result property="jobId" column="job_id" />
<result property="erpBill" column="erp_bill" />
<result property="type" column="type" />
<result property="status" column="status" />
<result property="createTime" column="create_time" />
<result property="finishTime" column="finish_time" />
<result property="spare1" column="spare1" />
<result property="spare2" column="spare2" />
<result property="spare3" column="spare3" />
</resultMap>
<sql id="selectTransferBillCallbackVo">
select id, job_id, erp_bill, type, status, create_time, finish_time, spare1, spare2, spare3 from transfer_bill_callback
</sql>
<select id="selectTransferBillCallbackList" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
<include refid="selectTransferBillCallbackVo"/>
<where>
<if test="jobId != null and jobId != ''"> and job_id = #{jobId}</if>
<if test="erpBill != null and erpBill != ''"> and erp_bill = #{erpBill}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="finishTime != null and finishTime != ''"> and finish_time = #{finishTime}</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>
</where>
</select>
<select id="selectTransferBillCallbackById" parameterType="Long" resultMap="TransferBillCallbackResult">
<include refid="selectTransferBillCallbackVo"/>
where id = #{id}
</select>
<insert id="insertTransferBillCallback" parameterType="TransferBillCallback" useGeneratedKeys="true" keyProperty="id">
insert into transfer_bill_callback
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jobId != null">job_id,</if>
<if test="erpBill != null">erp_bill,</if>
<if test="type != null">type,</if>
<if test="status != null">status,</if>
<if test="createTime != null">create_time,</if>
<if test="finishTime != null">finish_time,</if>
<if test="spare1 != null">spare1,</if>
<if test="spare2 != null">spare2,</if>
<if test="spare3 != null">spare3,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jobId != null">#{jobId},</if>
<if test="erpBill != null">#{erpBill},</if>
<if test="type != null">#{type},</if>
<if test="status != null">#{status},</if>
<if test="createTime != null">#{createTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="spare1 != null">#{spare1},</if>
<if test="spare2 != null">#{spare2},</if>
<if test="spare3 != null">#{spare3},</if>
</trim>
</insert>
<update id="updateTransferBillCallback" parameterType="TransferBillCallback">
update transfer_bill_callback
<trim prefix="SET" suffixOverrides=",">
<if test="jobId != null">job_id = #{jobId},</if>
<if test="erpBill != null">erp_bill = #{erpBill},</if>
<if test="type != null">type = #{type},</if>
<if test="status != null">status = #{status},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="spare1 != null">spare1 = #{spare1},</if>
<if test="spare2 != null">spare2 = #{spare2},</if>
<if test="spare3 != null">spare3 = #{spare3},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTransferBillCallbackById" parameterType="Long">
delete from transfer_bill_callback where id = #{id}
</delete>
<delete id="deleteTransferBillCallbackByIds" parameterType="String">
delete from transfer_bill_callback where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>