diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index adbc379..de24616 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -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(); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/controller/TransferBillCallbackController.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/controller/TransferBillCallbackController.java new file mode 100644 index 0000000..4b6550c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/controller/TransferBillCallbackController.java @@ -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 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 list = transferBillCallbackService.selectTransferBillCallbackList(transferBillCallback); + ExcelUtil util = new ExcelUtil(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)); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/domain/TransferBillCallback.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/domain/TransferBillCallback.java new file mode 100644 index 0000000..16da8b8 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/domain/TransferBillCallback.java @@ -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(); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/mapper/TransferBillCallbackMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/mapper/TransferBillCallbackMapper.java new file mode 100644 index 0000000..ea2395c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/mapper/TransferBillCallbackMapper.java @@ -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 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); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/ITransferBillCallbackService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/ITransferBillCallbackService.java new file mode 100644 index 0000000..bd69933 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/ITransferBillCallbackService.java @@ -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 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); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/TransferBillCallbackServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/TransferBillCallbackServiceImpl.java new file mode 100644 index 0000000..522e284 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/impl/TransferBillCallbackServiceImpl.java @@ -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 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); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index 03179c4..f1082b2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -283,8 +283,6 @@ public class MydoJobServiceImpl implements IMydoJobService { transferBillCallbackService.updateTransferBillCallback(transferBillCallback); } } - }else { - //todo 退料入库 其它入库 } return AjaxResult.success(); } else { diff --git a/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml new file mode 100644 index 0000000..8fcd1e0 --- /dev/null +++ b/ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + select id, job_id, erp_bill, type, status, create_time, finish_time, spare1, spare2, spare3 from transfer_bill_callback + + + + + + + + insert into transfer_bill_callback + + job_id, + erp_bill, + type, + status, + create_time, + finish_time, + spare1, + spare2, + spare3, + + + #{jobId}, + #{erpBill}, + #{type}, + #{status}, + #{createTime}, + #{finishTime}, + #{spare1}, + #{spare2}, + #{spare3}, + + + + + update transfer_bill_callback + + job_id = #{jobId}, + erp_bill = #{erpBill}, + type = #{type}, + status = #{status}, + create_time = #{createTime}, + finish_time = #{finishTime}, + spare1 = #{spare1}, + spare2 = #{spare2}, + spare3 = #{spare3}, + + where id = #{id} + + + + delete from transfer_bill_callback where id = #{id} + + + + delete from transfer_bill_callback where id in + + #{id} + + + \ No newline at end of file