guoyuji
2024-07-15 b21bb63b5058abd61b058b5df3aef554a1208053
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
2个文件已修改
7 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainProductStock/StorageRecord.vue
@@ -144,7 +144,6 @@
        total.dataTotal = res.data.total.total*1
        total.pageTotal= res.data.total.pageTotal
      }
      pageNum.value=1
      produceList = deepClone(res.data.data)
      xGrid.value.loadData(produceList)
      gridOptions.loading=false
north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml
@@ -159,7 +159,6 @@
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>
    <update id="updateToExamine">
@@ -297,8 +296,6 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>
    <select id="getselectAllocateFinishedOperateLog" resultMap="selectFinishedGoodsInventory" >
@@ -404,7 +401,6 @@
                and fol.operate_time regexp #{finishedOperateLog.operateTime}
            </if>
        </where>
        limit #{offset},#{pageSize};
    </select>
@@ -545,8 +541,6 @@
                and fol.remarks regexp #{finishedOperateLog.remarksr}
            </if>
        </where>
        order by fol.`status` desc
        limit #{offset},#{pageSize};
    </select>
    <select id="getselectFinishedOperateLog" >