diff --git a/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html b/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html index ee662e91..4ae93b76 100644 --- a/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html +++ b/ruoyi-admin/src/main/resources/templates/inventory/delivery/view.html @@ -1,5 +1,5 @@ - + @@ -72,6 +72,11 @@ +
@@ -91,6 +96,22 @@ focusCleanup: true }); + function exportDetail() { + let data={ + id: [[${inventoryDelivery.id}]] + } + $.modal.loading("正在导出数据，请稍候..."); + $.post(prefix+"/detail/export", data, function (result) { + if (result.code == web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); + } function submitHandler() { if ($.validate.form()) { $.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize()); diff --git a/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html b/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html index 834062ee..14785e37 100644 --- a/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html +++ b/ruoyi-admin/src/main/resources/templates/inventory/outer/edit.html @@ -475,7 +475,6 @@ return; } let arrays = [] - debugger if (productSnData.length <= 0) { arrays = $.table.selectColumns("productSn"); // if (arrays.length != quantity) { diff --git a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html index e0b0f59f..eb493ecd 100644 --- a/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html +++ b/ruoyi-admin/src/main/resources/templates/inventory/outer/outer.html @@ -14,6 +14,18 @@ +
  • + + +
    • +
  • + + +
    • +
  • + + +
  • + diff --git a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterMapper.xml b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterMapper.xml index 7d022265..de1ce0d7 100644 --- a/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/inventory/InventoryOuterMapper.xml @@ -83,6 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and t1.quantity = #{quantity} + and t4.project_code = #{projectCode} + and t4.project_name like concat('%' ,#{projectName},'%') and t1.outer_status = #{outerStatus} and t1.outer_status in