skyouc
2025-08-15 e8cbdfacdc15ce8e0faa1f4effc1154479b6ed31
no message
7个文件已修改
60 ■■■■■ 已修改文件
zy-asrs-admin/src/views/loc/locDetl/index.vue 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/views/loc/locDetl/index.vue
@@ -13,6 +13,7 @@
const TABLE_KEY = 'table-locDetl';
let currentPage = 1;
let pageSize = 10;
let allQty = 0;
const searchInput = ref("")
const orderBy = ref({});
const searchParam = ref({
@@ -33,7 +34,7 @@
let tableData = ref([]);
getColumns();
getPage();
getTotalQty();
const {
  getColumnSearchProps,
  handleResizeColumn,
@@ -248,6 +249,26 @@
  }
}
function getTotalQty() {
  state.loading = true;
  post('/api/locDetl/all/Qty').then((resp) => {
    let result = resp.data;
    if (result.code == 200) {
      let {data} = result;
      console.log("------------=======>");
      allQty = data?.allQty;
      state.loading = false;
    } else if (result.code === 401) {
      message.error(result.msg);
      logout()
    } else {
      message.error(result.msg);
    }
  })
}
function getPage() {
  state.loading = true;
  post('/api/locDetl/page', {
@@ -424,8 +445,9 @@
        </template>
      </template>
      <template #footer>
        <div>
          <span>当前页总量:{{ total }}</span>
        <div style="display: 'flex';">
          <span>总库存:{{ allQty }} </span>
          <span>, 当前页总量:{{ total }}</span>
        </div>
      </template>
    </a-table>
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -70,6 +70,13 @@
        return R.ok().add(data);
    }
    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/all/Qty")
    public R getAllStock() {
        return locDetlService.getAllStockQty();
    }
    @PreAuthorize("hasAuthority('asrs:locDetl:list')")
    @PostMapping("/locDetl/outPage")
    public R outPage(@RequestBody Map<String, Object> map) {
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OutController.java
@@ -84,7 +84,7 @@
    @PostMapping("/out/orderOut/wave/preview")
    @OperationLog("预览波次出库")
    @Transactional
    @Transactional(rollbackFor = Exception.class)
    public R orderOutWavePreview(@RequestBody OrderOutWavePreviewParam param) {
        if (param == null) {
            throw new CoolException("参数不能为空");
@@ -126,12 +126,12 @@
    @PostMapping("/out/orderOut/merge/wave")
    @OperationLog("生成波次任务")
    @Transactional
    public R orderOutMerge(@RequestBody OrderOutMergeParamDto param) {
        outManage.orderOutMergeWave(param);
        return R.ok();
    }
    @PostMapping("/out/locs/stock")
    @OperationLog("手动出库")
    public R stockOut(@RequestBody StockOutParam param) {
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocDetlMapper.java
@@ -19,4 +19,6 @@
    List<LocDetl> getStock(String matnr, String batch, List<Long> ids);
    Double getAllStock();
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocDetlService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.LocDetl;
import com.zy.asrs.wms.asrs.entity.ViewLocDetl;
import com.zy.asrs.wms.asrs.entity.param.FieldParam;
@@ -30,4 +31,6 @@
    void removeLocDetl(Long locId);
    List<LocDetl> queryFlatStock(String matnr, String batch, List<FieldParam> uniqueField);
    R getAllStockQty();
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.*;
import com.zy.asrs.wms.asrs.entity.enums.LocAreaTypeSts;
@@ -240,4 +241,16 @@
        });
        return detls;
    }
    /**
     * 获取所有库存数量
     * @return
     */
    @Override
    public R getAllStockQty() {
        Map<String, Double> map = new HashMap<>();
        Double allQty = this.baseMapper.getAllStock();
        map.put("allQty", allQty);
        return R.ok().add(map);
    }
}
zy-asrs-wms/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -30,4 +30,7 @@
        </if>
    </select>
    
    <select id="getAllStock" resultType="java.lang.Double">
        SELECT SUM(anfme) all_qty FROM man_loc_detl WHERE deleted = 0
    </select>
</mapper>