futian.liu
2023-12-15 20249c17d5b28c588e88451545af291995271f9c
1.出库手续回显
2.调拨申请时库存查询更换接口
5个文件已修改
19 ■■■■ 已修改文件
admin-web/src/api/baseSetting/finsystenant.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/transfer/transferApplication/edit.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/views/stock/transfer/transferissue/detail.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin-web/src/api/baseSetting/finsystenant.js
@@ -137,6 +137,15 @@
    params,
  });
}
// 未选择仓库时的库存查询,查所有仓库
export function warehouseAllSelectNumber(params) {
  return request({
    url: '/pc/base/warehouse/select/in/warehouse/num',
    method: 'get',
    params,
  });
}
// 库存
export function tenantUserQueryUser(params) {
  return request({
admin-web/src/views/stock/transfer/transferApplication/edit.vue
@@ -177,7 +177,7 @@
</template>
<script>
import {getParentTenant, queryWarehouseGoods, transferAdd} from '@/api/stock/transfer';
import {getCategorySelectTree, goodsModel, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
import {getCategorySelectTree, goodsModel, warehouseAllSelectNumber, warehouseSelectNumber} from '@/api/baseSetting/finsystenant';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
import upload from '@/components/upload/index';
@@ -373,7 +373,7 @@
      for (let item of e) {
        if (str.indexOf(item) == -1) {
          let temp = this.goodsModelAll.find((v) => v.id == item);
          let num = await warehouseSelectNumber({
          let num = await warehouseAllSelectNumber({
            baseGoodsModelsId: item,
            warehouseType: 0,
            states: 1,
admin-web/src/views/stock/transfer/transferissue/detail.vue
@@ -130,7 +130,7 @@
    this.loading = true;
    transferDetail({id: this.setting.id}).then((res) => {
      this.detail = res;
      this.fileList = this.detail.doc ? JSON.parse(this.detail.doc) : [];
      this.fileList = this.detail.procureDoc ? JSON.parse(this.detail.procureDoc) : [];
      this.loading = false;
      this.$nextTick(() => {
        this.initPreviewImg();
consum-base/src/main/java/com/consum/base/pojo/LWhFormOutputParam.java
@@ -29,7 +29,7 @@
     * 出库手续
     */
    @ApiModelProperty(value = "出库手续")
    private String procureDoc;
    private String doc;
    /**
     * 记录物品信息和规格型号
     */
consum-base/src/main/java/com/consum/base/service/impl/LWhFormOutputServiceImpl.java
@@ -90,7 +90,7 @@
        lWhFormOutput.setOperatorName(sysInfo.getUserName());
        lWhFormOutput.setDealTime(param.getDealTime());
        lWhFormOutput.setStates(OutPutStatesType.OUT_PENDING.getValue());
        lWhFormOutput.setOutputDoc(param.getProcureDoc());
        lWhFormOutput.setOutputDoc(param.getDoc());
        int flag1 = this.insert(lWhFormOutput);
        if (flag1 == 0) {
            log.error("新增出库单记录");