Commit Graph

312 Commits (77957dc94afabc14e8bcad9bab783f17ab427614)

Author SHA1 Message Date
郑明梁 77957dc94a Merge remote-tracking branch 'origin/orderChange' into orderChange
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java
3 years ago
郑明梁 b55295451f 同步管理系统busUser上的bug 3 years ago
x_z 3ec33511ce 1.设备领用记录添加领用人字段 3 years ago
x_z 9856b83d4d 1.同步busUser分支的bug修复 3 years ago
x_z 121003e42b Merge remote-tracking branch 'origin/orderChange' into zhairh 3 years ago
anthonyywj2 83599ef8b7 单据回退问题,补单时间改为审核时间往后 3 years ago
x_z 78a040565f 1.修复撤回未验收单据后未置空扫码单据关联业务单据号问题 3 years ago
x_z 6e1a461a36 Merge remote-tracking branch 'origin/orderChange' into zhairh 3 years ago
x_z 2e814bfc63 1.完成设备养护功能 3 years ago
x_z 1794802bd7 1.提交设备养护实体类和查询接口文件 3 years ago
x_z d219f3d78e 1.修改设备养护表及相关接口 3 years ago
anthonyywj2 fe3483f3bd 系统优化 3 years ago
x_z d6d4cc27f6 1.调整设备领用接口,优化逻辑,修复部分bug 3 years ago
x_z f10b0f29c1 1.添加设备养护记录相关接口逻辑代码 3 years ago
x_z b11e8fdd57 1.添加设备养护记录详情接口 3 years ago
x_z 889cd671f6 1.保存代码 3 years ago
x_z 6ce835f118 1.保存代码 3 years ago
x_z 5305354837 1.添加设备领用养护功能相关的实体类和xml文件以及表sql 3 years ago
x_z b932e8ff24 Merge remote-tracking branch 'origin/orderChange' into zhairh
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
3 years ago
x_z 9905450be6 1.库存养护详情添加养护时间和更新时间字段
2.修复库存养护功能bug
3 years ago
郑明梁 2c3d8de691 同步busUser上的bug 3 years ago
x_z dc85b6559e 1.完成新增盘点单接口编写 3 years ago
x_z 1bee746e3b Merge remote-tracking branch 'origin/orderChange' into zhairh 3 years ago
x_z f8b044e9cd 1.调整库存养护记录和详情查询 3 years ago
x_z dda99de27d 1.调整库存养护记录列表查询接口根据更新时间排序 3 years ago
anthonyywj2 78eede1aef 单据流转设置改动,采购管理优化,bug处理 3 years ago
anthonyywj2 3b8e7b1972 切换分支代码备份 3 years ago
x_z fdc7adb9f3 1.添加库存养护记录详情接口 3 years ago
x_z 86367efddd 1.添加库存养护记录接口 3 years ago
x_z 1b47936969 Merge remote-tracking branch 'origin/busUser' into zhairh 3 years ago
x_z 425752bfd9 1.修复盘点转单问题 3 years ago
zhengmingliang 8f2d6fcb34 修改sql问题 3 years ago
zhengmingliang c860f06157 同步自助平台代码 3 years ago
x_z 76ceab7a45 1.修复转单问题,条码添加供应商信息 3 years ago
zhengmingliang 61248fc682 同步自助平台代码 3 years ago
x_z 2cd2d87ed1 1.盘点单据码详情,添加扫码数量字段
2.重写盘点单据转扫码单逻辑
3 years ago
x_z 29a33df20e 1.调整盘点转单功能 3 years ago
x_z f2b7d009da 1.添加库存养护功能代码 3 years ago
x_z 3012af591f Merge remote-tracking branch 'origin/zhairh' into busUser
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
3 years ago
x_z 1989fb27e5 Merge remote-tracking branch 'origin/busUser' into zhairh
# Conflicts:
#	api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
3 years ago
x_z c56ed7d5b0 Merge remote-tracking branch 'origin/zhairh' into zhairh 3 years ago
x_z a02846b562 1.修复盘点转单bug 3 years ago
anthonyywj2 a5147bd4f7 同步设置报错问题 3 years ago
anthonyywj2 affd380b00 同步设置报错问题 3 years ago
anthonyywj2 6c071984c4 Merge remote-tracking branch 'origin/zhairh' into zhairh 3 years ago
zhengmingliang 7e185e74d8 同步自助平台代码 3 years ago
x_z d84b4ff437 1.修复盘点bug 3 years ago
anthonyywj2 d08464a4c6 备份 3 years ago
x_z 76166a9628 1.盘点码详情添加批次号字段
2.修复盘点的bug
3 years ago
x_z 9f8e17dec0 Merge remote-tracking branch 'origin/busUser' into zhairh
# Conflicts:
#	api-admin/src/main/resources/application-dev.properties
3 years ago