86158
|
b5804ebf85
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
025e5e6af0
|
完善了模具点检
|
2 months ago |
kkk-ops
|
bb709e000c
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
83fb4f6573
|
设备备件
|
2 months ago |
|
86158
|
d7bb0d5163
|
Merge branch 'plp'
|
2 months ago |
|
86158
|
820efaa232
|
完成了模具点检
|
2 months ago |
|
kkk-ops
|
d9acb82982
|
Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_server
|
2 months ago |
|
kkk-ops
|
7c0ba3f1ce
|
领模出库
|
2 months ago |
|
86158
|
0e562a9678
|
完成了配方配置
|
2 months ago |
|
kkk-ops
|
4a61b21753
|
派工修改
|
3 months ago |
|
kkk-ops
|
df41739244
|
生产计划
|
3 months ago |
|
kkk-ops
|
5f80944898
|
库存查询
|
3 months ago |
|
kkk-ops
|
be560924b5
|
commit
|
3 months ago |
chenyuan
|
ddcc9bf9c1
|
Merge branch 'dev' of https://gitee.com/chenshuichuan/besure_neimeng into dev
|
10 months ago |
|
chenyuan
|
080843cfb8
|
fix erp
|
1 year ago |
|
chenshuichuan
|
328947a8a9
|
fix erp auth
|
2 years ago |
|
chenshuichuan
|
0950f5f4a2
|
fix erp and 供应链大屏
|
2 years ago |
|
chenshuichuan
|
8bf81f1416
|
add device component
|
2 years ago |
|
chenshuichuan
|
16a12628eb
|
add mold record
|
2 years ago |
|
chenyuan
|
d7745a285c
|
add mold product
|
2 years ago |
|
chenshuichuan
|
87e34e30ac
|
fix
|
2 years ago |
|
chenshuichuan
|
29ba7196af
|
fix
|
2 years ago |
|
chenshuichuan
|
4cd7ebcea8
|
fix erp
|
2 years ago |
|
chenshuichuan
|
34713bc663
|
fix erp
|
2 years ago |
|
chenshuichuan
|
344724dee0
|
fix erp
|
2 years ago |
|
chenshuichuan
|
621fceebfa
|
fix some bug and add field
|
2 years ago |
|
chenshuichuan
|
eaa34df5df
|
fix mes stock in and out type
|
2 years ago |
|
chenshuichuan
|
13e6ec043f
|
fix mes some status
|
2 years ago |
|
chenshuichuan
|
99d03b80b5
|
fix feeding and plan
|
2 years ago |
|
chenshuichuan
|
eecdbf01b3
|
fix mes stock workshop
|
2 years ago |
|
chenshuichuan
|
e00d91e7ed
|
fix purchase order
|
2 years ago |
|
chenshuichuan
|
8a3eec1373
|
add task and plan
|
2 years ago |
|
chenshuichuan
|
a2a2b50ac7
|
add item analysis
|
2 years ago |
|
chenshuichuan
|
4445d42621
|
add auto code
|
2 years ago |
|
chenshuichuan
|
26fac3bc25
|
fix stock category
|
2 years ago |
|
chenshuichuan
|
a73a5d7bbb
|
stock add categoryId
|
2 years ago |
|
chenshuichuan
|
ca5cfa720b
|
add plan 关联
|
2 years ago |
|
chenshuichuan
|
f317b2e8f9
|
fix task
|
2 years ago |
|
chenshuichuan
|
15ac0a328e
|
add iot module
|
2 years ago |
|
chenshuichuan
|
c45a0f8df6
|
fix task
|
2 years ago |
|
chenshuichuan
|
cf9f50266f
|
fix product
|
2 years ago |
|
chenyuan
|
42eb696cc9
|
fix mold
|
2 years ago |
|
chenyuan
|
b722c53492
|
fix auto code
|
2 years ago |
|
chenyuan
|
f1c0533899
|
add auto code
|
2 years ago |
|
chenyuan
|
1ea1f11eb9
|
add mold
|
2 years ago |
|
chenyuan
|
becedb5388
|
fix erp
|
2 years ago |
YunaiV
|
b44eab7f93
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
# yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
# yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java
|
2 years ago |
|
YunaiV
|
9cba258d8f
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk21
|
2 years ago |
|
YunaiV
|
1904f8ca88
|
Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2 years ago |
|
YunaiV
|
1e348dbf83
|
【优化】将项目的 annotations 统一修改成 annotation 包
|
2 years ago |