diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java index 17379642..f5b0a921 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/BmNumLogs.java @@ -129,4 +129,10 @@ public class BmNumLogs extends BaseEntity { private String parentId; private String inputNum; + @Excel(name = "http返回消息") + private String msg; + + @Excel(name = "http返回码") + private String code; + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java index 827edf08..f713d489 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/LeaseOutDetailsController.java @@ -138,7 +138,7 @@ public class LeaseOutDetailsController extends BaseController { * * @param parentId */ - @Log(title = "出库单查询", businessType = BusinessType.MATERIAL) + @Log(title = "出库单查询", businessType = BusinessType.QUERY) @GetMapping("/getOutboundOrder") public AjaxResult getOutboundOrder(String parentId) { startPage(); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml index ac810c95..1e119f50 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml @@ -776,7 +776,7 @@ LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id WHERE bcd.parent_id=#{parentId} and bcd.type_id=#{typeId} - and bcd.back_status='1' and bcd.is_finished is null + and bcd.back_status='1' and (bcd.is_finished is null or bcd.is_finished != 1)