Commits · 5dd248c7c6eac2ece0d4054406dee4e650ee1b21 · 胡懿 / warehouse

13 Jun, 2023 2 commits
- Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy · 5dd248c7
  胡懿 authored Jun 13, 2023
  
  5dd248c7
- 修复入库参数问题 · 7e4212e9
  yyq1988 authored Jun 13, 2023
  
  7e4212e9
12 Jun, 2023 7 commits
- Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy · 119d5aec
  胡懿 authored Jun 12, 2023
  
  119d5aec
- Merge remote-tracking branch 'origin/master' · e24e3353
  yyq1988 authored Jun 12, 2023
  
  e24e3353
- 修复盘盈入库相关问题 · 7e5c153e
  yyq1988 authored Jun 12, 2023
  
  7e5c153e
- Merge branches 'master' and 'zlt' of 47.92.228.5:huyi/warehouse into hy · ebf01ae7
```
# Conflicts:
#	src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/LedgerInfoMapper.java
```
  胡懿 authored Jun 12, 2023
  ebf01ae7
- 物资盘亏逻辑修改，盘亏出库后可进行修改，修改自动更新出库单，盘亏出库单，以及台账信息 · 208a468c
  zhanglt authored Jun 12, 2023
  
  208a468c
- Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy · 9049905e
  胡懿 authored Jun 12, 2023
  
  9049905e
- 盘亏重复添加问题修复 · 4f04e93b
  yyq1988 authored Jun 12, 2023
  
  4f04e93b
09 Jun, 2023 31 commits
- Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy · 40a75f67
  胡懿 authored Jun 09, 2023
  
  40a75f67
- 修复台账和物资明细统计 · bd28d5a2
  胡懿 authored Jun 09, 2023
  
  bd28d5a2
- 细节调整 · ce789f96
  yyq1988 authored Jun 09, 2023
  
  ce789f96
- Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy · e6ec36e3
  胡懿 authored Jun 09, 2023
  
  e6ec36e3
- 细节调整 · 222f85f9
  yyq1988 authored Jun 09, 2023
  
  222f85f9
- Merge remote-tracking branch 'origin/master' · a59abcd9
  yyq1988 authored Jun 09, 2023
  
  a59abcd9
- 细节调整 · 8718313b
  yyq1988 authored Jun 09, 2023
  
  8718313b
- 盘盈入库模块，bug修复 · a19d66e3
  zhanglt authored Jun 09, 2023
  
  a19d66e3
- 盘盈入库模块，bug修复 · cbb65015
  zhanglt authored Jun 09, 2023
  
  cbb65015
- 细节调整 · 72330993
  yyq1988 authored Jun 09, 2023
  
  72330993
- Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy · 8c7ba4c9
  胡懿 authored Jun 09, 2023
  
  8c7ba4c9
- 细节调整 · 037e5c5e
  yyq1988 authored Jun 09, 2023
  
  037e5c5e
- 细节调整 · 20ae3089
  yyq1988 authored Jun 09, 2023
  
  20ae3089
- Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy · aa540163
  胡懿 authored Jun 09, 2023
  
  aa540163
- 修复新增品名代码报错问题 · f4d655dc
  胡懿 authored Jun 09, 2023
  
  f4d655dc
- 细节调整 · d1e88404
  yyq1988 authored Jun 09, 2023
  
  d1e88404
- 修复入库单和台账统计中的货架，仓库合并问题 · 3f67152a
  胡懿 authored Jun 09, 2023
  
  3f67152a
- Merge branch 'master' of 47.92.228.5:huyi/warehouse into hy · da2590cb
  胡懿 authored Jun 09, 2023
  
  da2590cb
- 优化表格查询显示问题 · 3a177f3c
  yyq1988 authored Jun 09, 2023
  
  3a177f3c
- Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy · c4fcd9b4
  胡懿 authored Jun 09, 2023
  
  c4fcd9b4
- 修复领用模块物资查询 · b02be173
  胡懿 authored Jun 09, 2023
  
  b02be173
- 临时取消领用人校验 · 8fcd8aa7
  yyq1988 authored Jun 09, 2023
  
  8fcd8aa7
- 优化样式 · 2c92cff6
  yyq1988 authored Jun 09, 2023
  
  2c92cff6
- Merge remote-tracking branch 'origin/master' · b8309d91
  yyq1988 authored Jun 09, 2023
  
  b8309d91
- 优化台账明细分页 · 3a614492
  yyq1988 authored Jun 09, 2023
  
  3a614492
- Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy · cf1b65c6
  胡懿 authored Jun 09, 2023
  
  cf1b65c6
- 修复拆词中特殊字符影响的问题,修复重复入库的问题 · c7d9ac45
  胡懿 authored Jun 09, 2023
  
  c7d9ac45
- 台账明细添加数量显示 · 4b6ebd20
  yyq1988 authored Jun 09, 2023
  
  4b6ebd20
- 优化代码 · da938a9d
  yyq1988 authored Jun 09, 2023
  
  da938a9d
- 优化代码 · 92552de6
  yyq1988 authored Jun 09, 2023
  
  92552de6
- 明细回显重置delFlag=0 · 583912fd
  yyq1988 authored Jun 09, 2023
  
  583912fd