Commit Graph

708 Commits

Author SHA1 Message Date
zhangzhiqiang
694304b03f rev:设备管理页面维护 2023-10-17 14:43:04 +08:00
zhangzhiqiang
cd30e4b748 add:工序任务统计/生产进度统计分析 2023-10-13 17:30:55 +08:00
zhangzhiqiang
6fe96e4cac rev:出库分配库存修改 2023-10-13 09:23:34 +08:00
zhangzhiqiang
45f53662f2 rev:修改组盘记录页面 2023-10-12 20:15:49 +08:00
f07be22524 add:新增半成品虚拟入库 2023-10-12 17:37:55 +08:00
c67cd18b63 Merge remote-tracking branch 'origin/master' 2023-10-12 13:01:19 +08:00
b698c19413 fix:修正代码冲突 2023-10-12 13:00:52 +08:00
zhangzhiqiang
4f71b6f9c5 add:添加托盘状态查询 2023-10-12 11:04:12 +08:00
63582389bf Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/dao/mapper/PdmProduceWorkorderMapper.xml
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/workorder/impl/IPdmProduceWorkorderServiceImpl.java
2023-10-12 11:00:18 +08:00
c9ddff1a01 fix:增加工单工作顺序字段,删除工序顺序号字段; 2023-10-12 10:52:17 +08:00
zhangzhiqiang
023e47c8e6 add:组盘状态过滤 2023-10-12 10:29:10 +08:00
zhangzhiqiang
f3cb3fa083 Merge remote-tracking branch 'origin/master' 2023-10-11 19:50:59 +08:00
zhangzhiqiang
1f2da7be2f rev:修改配置 2023-10-11 19:50:21 +08:00
zhangzhiqiang
5252da91e8 add:统计分析质量检测分析;足盘模糊查询 2023-10-11 19:40:55 +08:00
f58edac2ef fix:分页优化 2023-10-11 16:53:46 +08:00
8787b6b151 add:收发存查询 2023-10-11 08:48:13 +08:00
zhangzhiqiang
24ed153a81 add:车间质量统计分析 2023-10-10 16:41:52 +08:00
zhangzhiqiang
e33ca3fae9 add:项目维护基础数据导入 2023-10-09 13:40:11 +08:00
ad8df52dcf rev:日库存统计增加:入库数、出库数 2023-10-09 11:21:59 +08:00
zhangzhiqiang
dbb70827d8 Merge remote-tracking branch 'origin/master' 2023-10-09 09:37:20 +08:00
zhangzhiqiang
8ab8ebf29f add:统计分析 2023-10-09 09:37:14 +08:00
aa923a5a1a add:实时库存分析 2023-10-08 16:37:17 +08:00
3a9ed53c21 Merge remote-tracking branch 'origin/master' 2023-10-08 13:38:04 +08:00
2693baf28c fix:修改销售订单表单样式引起的错误。 2023-10-08 13:37:46 +08:00
9c27279dbc add:历史库存分析 2023-10-08 13:28:40 +08:00
ee24ae7c2a add:订单新增生产数量等字段;
fix:修复相同订单号相同品目相同交期合并订单无订单号时的bug。
2023-10-08 13:25:08 +08:00
zhangzhiqiang
418b40f683 add:统计分析 2023-10-08 10:22:18 +08:00
zhangzhiqiang
d20e5f8282 add:统计分析 2023-10-07 09:58:37 +08:00
zhangzhiqiang
acd4fe5a48 Merge remote-tracking branch 'origin/master' 2023-10-07 09:10:17 +08:00
zhangzhiqiang
abe2990e51 add:半成品虚拟库 2023-10-07 09:10:11 +08:00
8ec3c4324a add:三线半成品移库 2023-09-28 16:13:47 +08:00
zhangzhiqiang
34c93e833a add:新增设备导入功能 2023-09-28 09:34:50 +08:00
zhangzhiqiang
9959ebd679 rev:配置 2023-09-22 15:34:58 +08:00
zhangzhiqiang
85fefa35c1 add:日库存 2023-09-22 14:09:32 +08:00
d55e063092 rev:aps原料需求和采购订单功能修改 2023-09-22 13:55:06 +08:00
zhangzhiqiang
e5f4aaff35 add:添加档案导入/故障分类;rev:分类分类显示异常 2023-09-21 21:48:16 +08:00
zhangzhiqiang
d6e5677bb7 rev:设备台账功能修改 2023-09-21 15:17:36 +08:00
zhangzhiqiang
790191603a Merge remote-tracking branch 'origin/aps_0918' into aps_0918 2023-09-20 16:31:21 +08:00
zhangzhiqiang
6308d6ba37 opt:分支合并 2023-09-20 16:31:09 +08:00
8e42ff2302 rev:aps相关数据变更 2023-09-19 22:03:01 +08:00
223f437338 rev:aps导出到原料需求,原材料编号和到货时间相同且同一天的多个订单自动合并成一个原料需求。 2023-09-19 22:02:33 +08:00
532b900347 rev:aps相关数据改动 2023-09-19 17:55:12 +08:00
18452c8181 rev:修改半成品库存相关字段 2023-09-19 17:54:07 +08:00
56bcda4269 rev:维修单填报新增备件出库 2023-09-19 17:39:12 +08:00
zhangzhiqiang
7f142e1e91 Merge remote-tracking branch 'origin/master' into aps_0918 2023-09-19 14:58:29 +08:00
zhangzhiqiang
3d682bb785 rev:配置文件环境 2023-09-19 14:48:07 +08:00
zhangzhiqiang
531062d9f6 add:日库存统计 2023-09-19 14:46:47 +08:00
200b799372 rev:提交aps相关数据库数据 2023-09-19 14:00:05 +08:00
57c1e568e1 rev:提交aps相关代码 2023-09-19 13:14:07 +08:00
9a6fdfe75c rev:提交aps相关代码 2023-09-19 13:13:18 +08:00