|
|
ef78cef7d8
|
rev：导入销售单生成id
|
2023-08-10 16:36:14 +08:00 |
|
|
|
379cfc7179
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-08-10 16:35:30 +08:00 |
|
|
|
c433ccde33
|
rev：导入销售单生成id
|
2023-08-10 16:35:12 +08:00 |
|
zhangzhiqiang
|
dc5031c9fa
|
Merge remote-tracking branch 'origin/master'
|
2023-08-10 16:35:07 +08:00 |
|
zhangzhiqiang
|
57e6bebda1
|
add:添加刻字回流
|
2023-08-10 16:35:02 +08:00 |
|
|
|
81606c082c
|
rev：仓位模糊查询修改、组盘记录：过滤掉相同订单、托盘的组盘记录
|
2023-08-10 15:04:59 +08:00 |
|
zhangzhiqiang
|
bcbe605342
|
修改:临时包装区上料
|
2023-08-10 14:45:45 +08:00 |
|
|
|
93fa9f818f
|
rev：成品出库分配设置站点需改为 生成任务和下发任务一起
|
2023-08-10 10:45:47 +08:00 |
|
zhangzhiqiang
|
59f002b063
|
rev:清洗机上料任务
|
2023-08-09 22:20:00 +08:00 |
|
zhangzhiqiang
|
192561edfe
|
add：一体机包装机叫料功能
|
2023-08-09 15:47:37 +08:00 |
|
zhangzhiqiang
|
ef17d390f7
|
add：组盘修改删除/包装机新增字段
|
2023-08-08 22:06:19 +08:00 |
|
zhangzhiqiang
|
fdf577f540
|
Merge remote-tracking branch 'origin/master'
|
2023-08-08 10:23:57 +08:00 |
|
zhangzhiqiang
|
bdd1aa57cc
|
add:组盘导入临时新增销售订单
|
2023-08-08 10:23:52 +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 |
|
USER-20220102CG\noblelift
|
5f9f4ba30c
|
rev 优化舞台监控
|
2023-08-01 22:52:57 +08:00 |
|
|
|
2938cb17a4
|
add：海柔半成品入库、海柔半成品库存、海柔半成品库存变动
|
2023-08-01 17:56:53 +08:00 |
|
zhangzhiqiang
|
fad2c8289f
|
add:刻字工序
|
2023-07-31 18:15:48 +08:00 |
|
zhangzhiqiang
|
e02421418c
|
rev：成品出库设置站点修改
|
2023-07-27 20:35:36 +08:00 |
|
|
|
ed000b6f56
|
rev: 成品出库：新增出库单时将同一货位上的所有物料带出、设置任务时同一货位的任务不在生成、发货单状态修改
|
2023-07-27 17:00:57 +08:00 |
|
zhangzhiqiang
|
bd5ae21530
|
rev:储料仓重量上线修改
|
2023-07-27 15:33:37 +08:00 |
|
zhangzhiqiang
|
e73877620a
|
add:仓位物料设置
|
2023-07-27 15:21:42 +08:00 |
|
zhangzhiqiang
|
b2d2cda72b
|
Merge remote-tracking branch 'origin/master'
|
2023-07-27 11:22:30 +08:00 |
|
zhangzhiqiang
|
4edcab8b9e
|
rev：出库修改
|
2023-07-27 11:22:23 +08:00 |
|
USER-20220102CG\noblelift
|
5de4864ecc
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-07-26 11:29:18 +08:00 |
|
USER-20220102CG\noblelift
|
2aedcf50fd
|
rev opc同步线程
|
2023-07-26 11:29:05 +08:00 |
|
zhangzhiqiang
|
e60c8a8c0f
|
rev:删除无用引用
|
2023-07-25 18:46:04 +08:00 |
|
zhangzhiqiang
|
de81709cb6
|
rev:手持成品入库单据列表改分页
|
2023-07-25 18:44:06 +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 |
|
jiaoliming
|
3b02e7bc1c
|
fix ：清洗上料，下料
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-25 11:03:20 +08:00 |
|
jiaoliming
|
240d5aa8b4
|
fix : 修改刻字上料输送线逻辑
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-22 11:53:32 +08:00 |
|
zhouz
|
76d42e71fc
|
rev:维护销售订单、工艺路线、产品工艺路线功能
|
2023-07-21 17:24:01 +08:00 |
|
|
|
d43b0ba9eb
|
rev:修改bom单明细表增加aps相关字段。
|
2023-07-20 16:10:16 +08:00 |
|
|
|
7e7bbe64ba
|
add:增加aps的Bom数据相关功能；rev:修改一些uuid改为id,optid,optName改为id,name;
|
2023-07-20 15:03:45 +08:00 |
|
jiaoliming
|
415b980c51
|
add : 清洗后段
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-19 18:15:12 +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 |
|
|
|
dbf1cc2e1d
|
add:aps_sale_type,对应aps订单类型。
|
2023-07-17 16:33:10 +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 |
|
|
|
a020439a97
|
rev:修正物料信息为空的情况。
|
2023-07-11 10:26:59 +08:00 |
|
zhangzhiqiang
|
35f70da133
|
rev:刻字包装调度代码/半成品入库数量改重量
|
2023-07-11 09:26:57 +08:00 |
|
|
|
7ea3d22904
|
rev:aps订单强制完成，生成工单编号。
|
2023-07-10 21:54:20 +08:00 |
|
zhangzhiqiang
|
586436419b
|
rev:结构变更
|
2023-07-09 10:21:13 +08:00 |
|
