区分 仓库和礼品卡类型

erp_web/pages/manage/depot.html

@@ -312,6 +312,8 @@
 
     //保存信息
     $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 0;
         if (checkDepotName()) {
             return;
         }
@@ -320,7 +322,7 @@
             type: "post",
             dataType: "json",
             data: ({
-                info: JSON.stringify($("#depotFM").serializeObject())
+                info: JSON.stringify(infoObj)
             }),
             success: function(res) {
                 if(res && res.code === 200) {

erp_web/pages/manage/depotGift.html

@@ -306,6 +306,8 @@
 
     //保存信息
     $("#saveDepot").off("click").on("click", function () {
+        var infoObj = $("#depotFM").serializeObject();
+        infoObj.type = 1;
         if (checkDepotName()) {
             return;
         }
@@ -314,7 +316,7 @@
             type: "post",
             dataType: "json",
             data: ({
-                info: JSON.stringify($("#depotFM").serializeObject())
+                info: JSON.stringify(infoObj)
             }),
             success: function(res) {
                 if(res && res.code === 200) {

src/main/resources/mapper_xml/DepotMapperEx.xml

@@ -14,6 +14,7 @@
         <if test="remark != null">
             and remark like '%${remark}%'
         </if>
+        order by sort asc
         <if test="offset != null and rows != null">
             limit #{offset},#{rows}
         </if>