|
|
81606c082c
|
rev：仓位模糊查询修改、组盘记录：过滤掉相同订单、托盘的组盘记录
|
2023-08-10 15:04:59 +08:00 |
|
|
|
93fa9f818f
|
rev：成品出库分配设置站点需改为 生成任务和下发任务一起
|
2023-08-10 10:45:47 +08:00 |
|
zhangzhiqiang
|
ef17d390f7
|
add：组盘修改删除/包装机新增字段
|
2023-08-08 22:06:19 +08:00 |
|
|
|
28a203ca3d
|
add：盘点出库
|
2023-08-07 15:00:38 +08:00 |
|
zhangzhiqiang
|
3ace18354f
|
rev：成品入库批量归入
|
2023-08-07 09:01:32 +08:00 |
|
|
|
a1b892ff1b
|
add：PC海柔半成品盘点
|
2023-08-04 17:33:33 +08:00 |
|
zhangzhiqiang
|
172ec8692c
|
add:添加一体机批量入库/组盘
|
2023-08-04 14:23:32 +08:00 |
|
|
|
99813b0410
|
add：pc海柔半成品出库
|
2023-08-03 10:30:49 +08:00 |
|
|
|
2938cb17a4
|
add：海柔半成品入库、海柔半成品库存、海柔半成品库存变动
|
2023-08-01 17:56:53 +08:00 |
|
zhangzhiqiang
|
fad2c8289f
|
add:刻字工序
|
2023-07-31 18:15:48 +08:00 |
|
|
|
ed000b6f56
|
rev: 成品出库：新增出库单时将同一货位上的所有物料带出、设置任务时同一货位的任务不在生成、发货单状态修改
|
2023-07-27 17:00:57 +08:00 |
|
zhangzhiqiang
|
e73877620a
|
add:仓位物料设置
|
2023-07-27 15:21:42 +08:00 |
|
zhangzhiqiang
|
4edcab8b9e
|
rev：出库修改
|
2023-07-27 11:22:23 +08:00 |
|
zhangzhiqiang
|
373488ada2
|
add:新增半成品出入库导入/清洗刻字调度任务
|
2023-07-25 17:08:37 +08:00 |
|
zhangzhiqiang
|
cc2cf779e9
|
Merge remote-tracking branch 'origin/master'
|
2023-07-25 17:02:22 +08:00 |
|
zhouz
|
76d42e71fc
|
rev:维护销售订单、工艺路线、产品工艺路线功能
|
2023-07-21 17:24:01 +08:00 |
|
|
|
7e7bbe64ba
|
add:增加aps的Bom数据相关功能；rev:修改一些uuid改为id,optid,optName改为id,name;
|
2023-07-20 15:03:45 +08:00 |
|
zhangzhiqiang
|
47c6039853
|
rev：工单编号字典
|
2023-07-19 14:38:34 +08:00 |
|
zhangzhiqiang
|
98ef6cf4d4
|
add:清洗代码
|
2023-07-19 13:42:04 +08:00 |
|
|
|
2038cf1fe4
|
Merge remote-tracking branch 'origin/master'
|
2023-07-17 16:33:31 +08:00 |
|
|
|
4a0a36c091
|
rev:根据实际排产场景，修改销售订单内容
|
2023-07-17 16:29:29 +08:00 |
|
zhouz
|
76ff2a41ec
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
# mes/qd/src/api/wms/basedata/master/customerbase.js
|
2023-07-17 15:35:42 +08:00 |
|
zhouz
|
ffe29d6d4d
|
rev:新增导入相关功能
|
2023-07-17 11:28:11 +08:00 |
|
zhangzhiqiang
|
35f70da133
|
rev:刻字包装调度代码/半成品入库数量改重量
|
2023-07-11 09:26:57 +08:00 |
|
zhangzhiqiang
|
586436419b
|
rev:结构变更
|
2023-07-09 10:21:13 +08:00 |
|
zhangzhiqiang
|
974a14a63e
|
rev:刻字包装任务/工序/工单merge
|
2023-07-06 18:21:54 +08:00 |
|
zhangzhiqiang
|
4949856067
|
Merge remote-tracking branch 'origin/master'
|
2023-07-06 16:55:48 +08:00 |
|
|
|
fcea673861
|
更新 index.vue
rev:修改唯一key属性
|
2023-07-05 16:09:07 +08:00 |
|
|
|
e233f01bec
|
add:排产相关功能。 rev:修改工单管理，销售订单管理，工厂日历功能；
add:排产相关功能。
rev:修改工单管理，销售订单管理，工厂日历功能；
|
2023-07-05 16:00:55 +08:00 |
|
|
|
bdbd97a7bc
|
rev:半成品盘点一体机
|
2023-07-05 11:20:54 +08:00 |
|
zhangzhiqiang
|
418fc4b966
|
rev:刻字包装服务
|
2023-07-04 08:47:09 +08:00 |
|
|
|
ca68079d6f
|
rev：一体机半成品入库，半成品出库
|
2023-07-03 16:33:04 +08:00 |
|
zhangzhiqiang
|
128272a27d
|
rev:刻字后端代码
|
2023-07-03 14:28:32 +08:00 |
|
zhouz
|
ec0fd6cd53
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-07-03 08:58:41 +08:00 |
|
zhouz
|
3603386c81
|
rev:优化BUG
|
2023-07-03 08:58:31 +08:00 |
|
ludj
|
3b4485f945
|
rev: 界面样式修改
|
2023-06-30 15:57:32 +08:00 |
|
|
|
6bf6e23d0b
|
rev：半成品出库、半成品入库、半成品盘点、半成品拼盘、成品入库一体机
|
2023-06-30 15:37:00 +08:00 |
|
zhouz
|
f37b0afe88
|
rev:新增原料需求功能
|
2023-06-30 10:23:26 +08:00 |
|
zhouz
|
beecba8215
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-29 18:35:50 +08:00 |
|
zhouz
|
7b360a1743
|
rev:新增原材料需求功能
|
2023-06-29 18:35:44 +08:00 |
|
ludj
|
9106862f43
|
rev:界面布局优化
|
2023-06-28 11:06:23 +08:00 |
|
zhangzhiqiang
|
2d2d3d3c74
|
rev:基础数据用额面维护
|
2023-06-28 09:17:26 +08:00 |
|
zhouz
|
831acb3051
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-27 18:34:48 +08:00 |
|
zhouz
|
6ec8ac17ab
|
rev:原材料功能优化
|
2023-06-27 18:34:42 +08:00 |
|
|
|
c75f83cb0c
|
add: 一体机成品入库
|
2023-06-27 16:48:40 +08:00 |
|
|
|
b49adc53e6
|
rev:半成品拼盘
|
2023-06-27 14:10:12 +08:00 |
|
|
|
c09c3c926e
|
rev：半成品拼盘
|
2023-06-27 09:09:12 +08:00 |
|
zhangzhiqiang
|
08608e45d8
|
rev：刻字满料请求/空框请求
|
2023-06-27 08:42:41 +08:00 |
|
zhouz
|
a92101cea6
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-26 16:07:34 +08:00 |
|
zhouz
|
fcee4db153
|
rev:质检模块和原材料入库优化
|
2023-06-26 16:07:29 +08:00 |
|
