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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zj
2026-01-22 17:34:01 +08:00
parent a543291c5c 1db7209001
commit d8cb109415
6 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
View File

@@ -32,7 +32,7 @@ public class ToErpApiController {
/** /**
* 回传其他出入库单 * 回传其他出入库单
*/ */
@Scheduled(fixedDelay = 1500) @Scheduled(fixedDelay = 30000)
public void callbackTransferBill() { public void callbackTransferBill() {
toErpService.callbackTransferBill(); toErpService.callbackTransferBill();
} }

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

@@ -41,7 +41,8 @@ public class ToErpServiceImpl implements IToErpService {
public void callbackTransferBill() { public void callbackTransferBill() {
TransferBillCallback param = new TransferBillCallback(); TransferBillCallback param = new TransferBillCallback();
param.setStatus("0"); param.setStatus("0");
List<TransferBillCallback> list = transferBillCallbackService.selectTransferBillCallbackList(param); //List<TransferBillCallback> list = transferBillCallbackService.selectTransferBillCallbackList(param);
List<TransferBillCallback> list = transferBillCallbackService.getTopMsg(param);
for (TransferBillCallback transferBillCallback : list) { for (TransferBillCallback transferBillCallback : list) {
//todo 请求其他出入库单回传接口 //todo 请求其他出入库单回传接口
AjaxResult otherInOutboundOrder = createOtherInOutboundOrder(transferBillCallback); AjaxResult otherInOutboundOrder = createOtherInOutboundOrder(transferBillCallback);

2
ruoyi-admin/src/main/java/com/ruoyi/in/erp/mapper/TransferBillCallbackMapper.java
View File

@@ -58,4 +58,6 @@ public interface TransferBillCallbackMapper
* @return 结果 * @return 结果
*/ */
public int deleteTransferBillCallbackByIds(Long[] ids); public int deleteTransferBillCallbackByIds(Long[] ids);
List<TransferBillCallback> getTopMsg(TransferBillCallback param);
} }

1
ruoyi-admin/src/main/java/com/ruoyi/in/erp/service/ITransferBillCallbackService.java
View File

@@ -59,4 +59,5 @@ public interface ITransferBillCallbackService
*/ */
public int deleteTransferBillCallbackById(Long id); public int deleteTransferBillCallbackById(Long id);
List<TransferBillCallback> getTopMsg(TransferBillCallback param);
} }

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

@@ -92,4 +92,9 @@ public class TransferBillCallbackServiceImpl implements ITransferBillCallbackSer
{ {
return transferBillCallbackMapper.deleteTransferBillCallbackById(id); return transferBillCallbackMapper.deleteTransferBillCallbackById(id);
} }
@Override
public List<TransferBillCallback> getTopMsg(TransferBillCallback param) {
return transferBillCallbackMapper.getTopMsg(param);
}
} }

7
ruoyi-admin/src/main/resources/mapper/in/TransferBillCallbackMapper.xml
View File

@@ -96,4 +96,11 @@
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<select id="getTopMsg" parameterType="TransferBillCallback" resultMap="TransferBillCallbackResult">
select top(1)id, job_id, erp_bill, type, status, create_time, finish_time,
spare1, spare2, spare3, tray_code from transfer_bill_callback
where status=#{status}
order by create_time asc
</select>
</mapper> </mapper>