longyong

longyong ha pushato nel master in pengyue/jsh_erp

54bf2df97d fix:bug

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

296744993f Merge remote-tracking branch 'origin/dev_huangjunjie'
41c43e6427 商品信息bug修改
7f83d3a39d 盘点问题修改
Visualizza comparazione tra questi 3 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

2d340838c8 Merge remote-tracking branch 'origin/dev_ml_423'
ec7c8d3766 fix: 盘点
0846e8e16d Merge remote-tracking branch 'origin/dev_huangjunjie'
5ab8c14493 pda出入库明细问题修改
7ea6107648 修改盘点，订单问题
Visualizza comparazione tra questi 6 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

0d82a42fca Merge remote-tracking branch 'origin/dev_huangjunjie'
2735c8b82e fix:盘点模块商品选择
7ec2459a33 盘点模块及pda接口调整
Visualizza comparazione tra questi 3 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

01dd5972f0 Merge remote-tracking branch 'origin/dev_ml_423'
8e4d10f663 Merge remote-tracking branch 'origin/dev_huangjunjie'
32425ea6f3 盘点全盘批次号获取
dff1d99ce4 fix:商品编辑、新增
d4d90f79a7 Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into dev_huangjunjie
Visualizza comparazione tra questi 7 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

8096b802c9 fix:盘点任务商品选择弹框调整
7c11bc33ab Merge branch 'master' into dev_ml_423
7b2c219008 fix:商品单位
Visualizza comparazione tra questi 3 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

e4dccfdbaf Merge remote-tracking branch 'origin/xq' # Conflicts: # jshERP-web/src/views/bill/modules/PurchaseInModal.vue # jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue
33c24accbf Merge remote-tracking branch 'origin/dev_huangjunjie'
617f250e70 fix:商品信息
c8c2fa7378 新增数据库表格sql语句
8ec2116df6 Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into dev_huangjunjie
Visualizza comparazione tra questi 20 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

7b64139901 fix:bug[905]
59d184ff11 fix:bug
e0c98d3e81 bug修改提交
6211698478 bug修改提交
Visualizza comparazione tra questi 4 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

ccdbbc436e Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie
6be3284e4a 仓库删除限制，商品库存修改，pda版本更新接口放开
Visualizza comparazione tra questi 2 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

138b68d0f3 Merge remote-tracking branch 'origin/dev_ml'
3f6e97a0ea Merge remote-tracking branch 'origin/master_huangjunjie'
01d6bf5bfb fix:商品信息库存数量
11dcf62a78 商品库存修改
Visualizza comparazione tra questi 4 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

1fdc2db4a7 Merge remote-tracking branch 'origin/dev_ml'
ae31062341 fix:商品信息模版、列设置
96007c7c5e 订单实际入库数量为空处理
e9c0f10022 Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie # Conflicts: # src/main/resources/mapper_xml/DepotHeadMapper.xml
ec513b3968 pda订单数量0bug修改，付款金额由实际入库数量计算
Visualizza comparazione tra questi 6 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

3baa0de39a Merge remote-tracking branch 'origin/xq'
950100bd14 多余图标删除
e2eacc21ab 浏览器图标修改
Visualizza comparazione tra questi 3 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

a8554487c3 Merge remote-tracking branch 'origin/xq'
c96a19185e 批次号样式问题修改
Visualizza comparazione tra questi 2 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

fe17ec51b5 Merge remote-tracking branch 'origin/master_huangjunjie'
e6f6b2c3d9 订单查看图片问题修复
Visualizza comparazione tra questi 2 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

91b7130776 Merge remote-tracking branch 'origin/xq'
5544d5dbb5 bug修改
Visualizza comparazione tra questi 2 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

73435c0f4e Merge remote-tracking branch 'origin/master_huangjunjie' # Conflicts: # jshERP-web/src/views/system/modules/userSupplierModal.vue # src/main/resources/mapper_xml/DepotHeadMapper.xml
db7155e1bd Merge branch 'master_liaozeyong' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie # Conflicts: # jshERP-web/src/views/system/modules/userSupplierModal.vue # src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java # src/main/resources/mapper_xml/DepotHeadMapper.xml
cd8f2b5bec Merge remote-tracking branch 'origin/master_huangjunjie' # Conflicts: # jshERP-web/src/views/system/modules/userSupplierModal.vue # src/main/java/com/jsh/erp/service/impl/DepotItemServiceImpl.java # src/main/resources/mapper_xml/DepotHeadMapper.xml
9cbb6e29b5 Merge branch 'xq' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie # Conflicts: # jshERP-web/src/views/system/modules/userSupplierModal.vue
8e0b34b315 入口时间bug修改
Visualizza comparazione tra questi 6 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

effe59ae30 新增订单bug调整

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

6b684e2332 Merge remote-tracking branch 'origin/master_liushuang'
c4f99f6cfd Merge remote-tracking branch 'origin/master_liaozeyong'
d990d4829a Merge branch 'master' of http://121.40.253.172:3000/pengyue/jsh_erp into master_huangjunjie
1a3cdde780 商品编辑子商品空白bug修改
a009f8cefc Merge remote-tracking branch 'origin/xq' into master_liushuang # Conflicts: # jshERP-web/src/views/system/modules/userSupplierModal.vue
Visualizza comparazione tra questi 11 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

998708ea29 Merge remote-tracking branch 'origin/master_liushuang'
ec12e87232 Merge remote-tracking branch 'origin/master_huangjunjie'
9fe783a6c6 新增接口检查手机号码和类型是否存在
dda459c901 修改订单入库时间问题
Visualizza comparazione tra questi 4 commit »

4 mesi fa

longyong ha pushato nel master in pengyue/jsh_erp

e4cce594e5 配置文件更新

4 mesi fa