diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 7cc9e25a..4299cb7e 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -288,6 +288,19 @@ LIMIT #{begin},#{size} + + + + + select + + from applicationInRecordInfo + where 1 = 1 + + and did = #{depositoryId} + + + select @@ -313,6 +326,13 @@ LIMIT #{begin},#{size} + + + select + + from applicationOutRecordInfo + where 1 = 1 and depositoryId = #{depositoryId} + select diff --git a/target/classes/templates/pages/application/application-in.html b/target/classes/templates/pages/application/application-in.html index 91ccd433..65853fb4 100644 --- a/target/classes/templates/pages/application/application-in.html +++ b/target/classes/templates/pages/application/application-in.html @@ -48,6 +48,7 @@ + @@ -262,8 +263,6 @@ title: '提交成功' }] }); - - // 用于提交操作 form.on('submit(formStep)', function (data) { data = data.field; @@ -320,8 +319,7 @@ }); return false; }); - - + // 用于提交操作(组合) form.on('submit(formStep2)', function (data) { step.next('#stepForm'); return false; @@ -433,7 +431,6 @@ $("#stepForm").css("height", height + 587 + 'px'); $("#" + parentId).after(materialItem); }; - // 实现卡片删除 deleteItem = function (obj) { // 获取父节点 @@ -447,8 +444,6 @@ params = remove(params, parentId); reparent.removeChild(parent); }; - - //删除数组中指定元素 function remove(arr, item) { var result = []; @@ -460,7 +455,6 @@ } return result; } - // 用于选择生产日期 selectDate = function (obj) { var name = obj.id; @@ -470,8 +464,6 @@ , show: true }); }; - - // 用于实现通过编码查询物料 selectCode = function (obj) { // 输入code diff --git a/target/classes/templates/pages/material/selectPlaceByDepository.html b/target/classes/templates/pages/material/selectPlaceByDepository.html index 048cc0c9..02ab75bd 100644 --- a/target/classes/templates/pages/material/selectPlaceByDepository.html +++ b/target/classes/templates/pages/material/selectPlaceByDepository.html @@ -69,7 +69,6 @@ }); outQuantityCheck = function (placeId) { - console.log(quantity) layer.prompt({ formType: 0, value: quantity,