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 |
|
zhangzhiqiang
|
a37aaf90f3
|
rev:销售单同步/结构变动
|
2023-07-08 09:26:06 +08:00 |
|
zhangzhiqiang
|
974a14a63e
|
rev:刻字包装任务/工序/工单merge
|
2023-07-06 18:21:54 +08:00 |
|
zhangzhiqiang
|
8fb06c033c
|
Merge remote-tracking branch 'origin/master'
|
2023-07-06 18:17:12 +08:00 |
|
|
|
250592eacd
|
rev:成品入库一体机
|
2023-07-06 17:14:44 +08:00 |
|
zhangzhiqiang
|
4949856067
|
Merge remote-tracking branch 'origin/master'
|
2023-07-06 16:55:48 +08:00 |
|
|
|
3d1b6119e1
|
add:刻字机取放货判断工作模式
|
2023-07-06 16:31:42 +08:00 |
|
|
|
5d7c70570d
|
opt：优化工厂日历创建失败时回滚操作。
|
2023-07-06 15:35:33 +08:00 |
|
|
|
ebe6d6f027
|
rev：一体机修改重量为g
|
2023-07-06 14:49:41 +08:00 |
|
周俊杰
|
39e9afae00
|
海亮海柔接口
|
2023-07-06 14:36:03 +08:00 |
|
|
|
4dbb96f852
|
fix:升级版本，修复低版本fastjson反序列化错误
|
2023-07-05 18:57:11 +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 |
|
|
|
cc5d6be4da
|
rev：成品入库一体机
|
2023-07-05 15:04:19 +08:00 |
|
|
|
bdbd97a7bc
|
rev:半成品盘点一体机
|
2023-07-05 11:20:54 +08:00 |
|
|
|
1870c02e50
|
add：刻字称重
|
2023-07-05 11:04:04 +08:00 |
|
jiaoliming
|
d7104beb88
|
add : 合框称重
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 20:50:31 +08:00 |
|
jiaoliming
|
ea3b8caabc
|
fix:移除UnboxingOrderDto
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 19:18:00 +08:00 |
|
jiaoliming
|
bbc2b8b1c6
|
Revert "no message"
This reverts commit 337b1a0cdd.
|
2023-07-04 19:11:45 +08:00 |
|
jiaoliming
|
337b1a0cdd
|
no message
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 19:06:55 +08:00 |
|
jiaoliming
|
a27e76a7bd
|
add：清洗刻字包装
Signed-off-by: jiaoliming <dawnjiao@foxmail.com>
|
2023-07-04 19:00:33 +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 |
|
