Commit Graph

25 Commits

Author SHA1 Message Date
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
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
586436419b rev:结构变更 2023-07-09 10:21:13 +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
zhangzhiqiang
2d2d3d3c74 rev:基础数据用额面维护 2023-06-28 09:17:26 +08:00
zhangzhiqiang
08608e45d8 rev:刻字满料请求/空框请求 2023-06-27 08:42:41 +08:00
zhangzhiqiang
efc8ade0ef add:添加设备分配逻辑 rev:修改调度线路文件位置 2023-05-31 11:04:33 +08:00
zhangzhiqiang
eb7d4a2b40 add:半成品入库功能 2023-05-11 11:17:34 +08:00
zhangzhiqiang
1ee9d7362b rev:修改结构 2023-04-23 14:04:45 +08:00
zhangzhiqiang
729f61216a rev:成品入库 2023-04-14 11:13:56 +08:00
0646a9d6ee fix: 修复设备修改重复code的BUG以及工序的添加 2023-03-31 09:57:51 +08:00
891caa2e4c 代码修改 2023-03-22 17:17:22 +08:00
5b63a31619 生产设备修改 2023-03-22 16:43:39 +08:00
19737d8d8e 代码修改 2023-03-20 17:25:12 +08:00
9fc885b14b 设备与工单基础CRUD 2023-03-16 20:31:08 +08:00
be87c64a8d 设备管理 2023-03-16 09:50:39 +08:00
zhangzhiqiang
8139df6099 初始化项目 2023-03-14 15:31:36 +08:00
ldj_willow
86117a04ee 代码修改 2022-08-27 10:54:25 +08:00
b0b8f5bfd5 修改 2022-08-02 13:21:36 +08:00
e17321fd0e 修改 2022-08-02 13:21:19 +08:00
8bc7f54bbc init 2022-06-27 19:25:41 +08:00