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
|
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 |
|
|
|
a3ee247657
|
rev：半成品仓储
|
2023-06-26 16:00:03 +08:00 |
|
ludj
|
50bd42e7d1
|
rev：工单页面修改
|
2023-06-26 14:53:48 +08:00 |
|
ludj
|
8543e7b152
|
rev: 工单管理、任务管界面列优化
|
2023-06-26 14:23:38 +08:00 |
|
zhangzhiqiang
|
bec170a530
|
rev:sap同步销售单
|
2023-06-26 08:50:08 +08:00 |
|
|
|
cb78d9a38b
|
add：原材料、半成品、成品 库存变动记录页面
|
2023-06-25 21:13:57 +08:00 |
|
|
|
2c4b10ab3a
|
add：原材料、半成品、成品插入库存变动记录
|
2023-06-25 17:13:46 +08:00 |
|
|
|
f06ce83052
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-25 14:56:23 +08:00 |
|
|
|
44ed1da408
|
rev:质检模块
|
2023-06-25 14:56:13 +08:00 |
|
|
|
c576f04413
|
rev:新增质检模块
|
2023-06-25 09:01:56 +08:00 |
|
zhangzhiqiang
|
a7851ee375
|
Merge remote-tracking branch 'origin/master'
|
2023-06-24 19:06:58 +08:00 |
|
zhangzhiqiang
|
d9125962b2
|
add:刻字缓存物料维护/物料信息
|
2023-06-24 19:05:54 +08:00 |
|
zhouz
|
9f1a982a63
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-06-21 18:51:42 +08:00 |
|
zhouz
|
b4cfd1aa59
|
rev:添加质检功能
|
2023-06-21 18:51:35 +08:00 |
|
|
|
854abe73e1
|
rev：半成品任务反馈
|
2023-06-21 17:26:56 +08:00 |
|
|
|
e582ed1c2b
|
rev：界面优化
|
2023-06-20 20:41:06 +08:00 |
|
|
|
f02f3e063e
|
fix：成品出入库
|
2023-06-20 17:31:02 +08:00 |
|
