|
|
51513aaeea
|
fix：代码修复
|
2023-05-25 22:13:55 +08:00 |
|
|
|
cc15c50bbf
|
fix: 代码修复
|
2023-05-25 21:42:15 +08:00 |
|
|
|
0cf19a531f
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/controller/saleOrder/MpsSaleOrderController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/IMpsSaleOrderService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/MpsSaleOrderMapper.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/dao/mapper/xml/MpsSaleOrderMapper.xml
# mes/hd/nladmin-system/src/main/java/org/nl/wms/mps_manage/ordermanage/service/saleOrder/impl/MpsSaleOrderServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/controller/iostorInv/IStivtlostorivnCpOutController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/IStIvtIostorinvCpOutService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/iostorInv/impl/StIvtIostorinvCpOutServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/IStIvtStructivtCpService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/service/structIvt/impl/StIvtStructivtCpServiceImpl.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/productmanage/util/ChangeIvtUtil.java
# mes/qd/src/views/wms/storage_manage/product/productIn/AddDtl.vue
# mes/qd/src/views/wms/storage_manage/product/productOut/AddDialog.vue
# mes/qd/src/views/wms/storage_manage/product/productOut/DivDialog.vue
# mes/qd/src/views/wms/storage_manage/product/productOut/productout.js
|
2023-05-25 20:40:39 +08:00 |
|
|
|
65822e1864
|
rev : 出库分配
|
2023-05-25 20:38:18 +08:00 |
|
|
|
f530e6d7b4
|
add: 生产订单
|
2023-05-25 14:58:35 +08:00 |
|
|
|
84ecbf0b83
|
rev:库存更新，入库确认
|
2023-05-24 20:05:05 +08:00 |
|
zhangzhiqiang
|
1ce759c718
|
rev:生产调度相关
|
2023-05-24 09:42:52 +08:00 |
|
|
|
db5c1de411
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-24 09:33:18 +08:00 |
|
|
|
b022401963
|
rev:原材料出入库修改
|
2023-05-24 09:33:14 +08:00 |
|
|
|
bdf18b0dc3
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-24 09:27:51 +08:00 |
|
|
|
d5d4f74b5c
|
rev: 代码错乱修改
|
2023-05-24 09:27:37 +08:00 |
|
zhangzhiqiang
|
25075b9fcd
|
rev:新增工序调度
|
2023-05-23 16:21:14 +08:00 |
|
|
|
68a84a305a
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-23 13:57:40 +08:00 |
|
|
|
38feec1324
|
rev:新增老车间工单下发和打印功能
|
2023-05-23 13:57:20 +08:00 |
|
|
|
b3349b313f
|
rev： 代码合并
|
2023-05-23 09:47:34 +08:00 |
|
|
|
a229ccd9f8
|
rev:修改缓存线异常盘点功能
|
2023-05-22 12:28:21 +08:00 |
|
|
|
2e691aaef9
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-19 14:56:34 +08:00 |
|
|
|
15c59182aa
|
fix:缓存线异常处理功能
|
2023-05-19 14:56:18 +08:00 |
|
zhangzhiqiang
|
090cd3830e
|
rev：修改调度管理路径
|
2023-05-18 19:14:38 +08:00 |
|
zhangzhiqiang
|
90469ea6ae
|
add:修改工单相关
|
2023-05-17 17:36:40 +08:00 |
|
zhangzhiqiang
|
30db992ada
|
add:工单及工单记录
|
2023-05-17 15:15:35 +08:00 |
|
|
|
8026de6ec2
|
fix:原材料入库
|
2023-05-17 09:54:26 +08:00 |
|
|
|
9aeff869a6
|
rev: 成品入库分配修改
|
2023-05-15 11:53:40 +08:00 |
|
zhangzhiqiang
|
535b1a6b8c
|
rev：仓储基础管理维护
|
2023-05-15 11:23:04 +08:00 |
|
|
|
bad9c80a5f
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-15 09:34:39 +08:00 |
|
|
|
eb1d33da9d
|
rev: 代码提交
|
2023-05-15 09:29:48 +08:00 |
|
|
|
a097053f14
|
解决冲突
|
2023-05-15 09:23:47 +08:00 |
|
|
|
577c8ee65d
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtBsrealstorattrController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/controller/storage/StIvtStructattrController.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/IStIvtStructattrService.java
# mes/hd/nladmin-system/src/main/java/org/nl/wms/storage_manage/basedata/service/storage/impl/StIvtStructattrServiceImpl.java
|
2023-05-15 09:23:08 +08:00 |
|
|
|
27454e664e
|
add:新增原材料入库功能
|
2023-05-15 09:11:58 +08:00 |
|
|
|
4b3cba9ff2
|
add:入库分配
|
2023-05-15 08:58:59 +08:00 |
|
zhangzhiqiang
|
474df3f5d8
|
add:添加仓库记录表服务/修改仓库基础数据服务
|
2023-05-15 00:27:04 +08:00 |
|
|
|
db6ca6d0ac
|
fix:删除引用分配页面
|
2023-05-11 16:19:17 +08:00 |
|
|
|
0115eab818
|
rev: 入库组盘
|
2023-05-11 14:04:44 +08:00 |
|
zhangzhiqiang
|
eb7d4a2b40
|
add：半成品入库功能
|
2023-05-11 11:17:34 +08:00 |
|
|
|
c91a5f86e7
|
fix:原料入库主页面
|
2023-05-10 16:57:32 +08:00 |
|
|
|
38dfe6e96d
|
rev: xml路径修改
|
2023-05-10 11:10:29 +08:00 |
|
zhangzhiqiang
|
055ecfc400
|
add:主数据载具
|
2023-05-10 10:54:36 +08:00 |
|
zhangzhiqiang
|
8916b80dc0
|
rev:半成品维护
|
2023-05-10 09:47:12 +08:00 |
|
zhangzhiqiang
|
420eec9ace
|
add:半成品入库
|
2023-05-09 22:44:20 +08:00 |
|
|
|
ef710b9b5e
|
rev: 成品入库前后端修改
|
2023-05-09 21:00:53 +08:00 |
|
zhangzhiqiang
|
b974006173
|
rev:基础数据维护
|
2023-05-09 13:54:35 +08:00 |
|
|
|
1e2692e426
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-08 08:50:18 +08:00 |
|
|
|
53d4e9dd04
|
角色权限修改
|
2023-05-08 08:50:13 +08:00 |
|
|
|
46990a545c
|
add:新增半成品前端页面
|
2023-05-06 16:54:13 +08:00 |
|
|
|
1c327b5e58
|
新增原材料出入库、在库管理
|
2023-05-05 18:23:35 +08:00 |
|
|
|
047199776d
|
menuId改为menu_id
|
2023-05-05 16:35:38 +08:00 |
|
|
|
afd8dc8026
|
add:新增成品盘点管理前端页面
|
2023-05-05 16:26:11 +08:00 |
|
|
|
5da0c0eb0c
|
rev:修改前端引用路由
|
2023-05-05 15:43:37 +08:00 |
|
zhangzhiqiang
|
5a898e9f21
|
init structure
|
2023-05-05 15:06:20 +08:00 |
|
zhangzhiqiang
|
f87dd1690c
|
init：project structure
|
2023-04-28 14:56:51 +08:00 |
|
