Commit Graph

26 Commits

Author SHA1 Message Date
zhangzhiqiang
7f142e1e91 Merge remote-tracking branch 'origin/master' into aps_0918 2023-09-19 14:58:29 +08:00
zhangzhiqiang
531062d9f6 add:日库存统计 2023-09-19 14:46:47 +08:00
e8f6b19560 rev:提交aps相关代码 2023-09-18 13:26:48 +08:00
zhangzhiqiang
df9fdd85df add:仓库管理 2023-09-01 10:11:27 +08:00
zhangzhiqiang
b345ea5757 rev:刻字上料输送线任务顺序 2023-08-11 16:36:16 +08:00
zhangzhiqiang
4edcab8b9e rev:出库修改 2023-07-27 11:22:23 +08:00
zhangzhiqiang
373488ada2 add:新增半成品出入库导入/清洗刻字调度任务 2023-07-25 17:08:37 +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
zhangzhiqiang
08608e45d8 rev:刻字满料请求/空框请求 2023-06-27 08:42:41 +08:00
zhangzhiqiang
d9125962b2 add:刻字缓存物料维护/物料信息 2023-06-24 19:05:54 +08:00
zhouz
caa6ce91b2 rev:安全库存、库区维护 2023-06-15 16:56:52 +08:00
e0844386d6 rev:代码优化 2023-06-15 14:20:12 +08:00
d5d4f74b5c rev: 代码错乱修改 2023-05-24 09:27:37 +08:00
b3349b313f rev: 代码合并 2023-05-23 09:47:34 +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
27454e664e add:新增原材料入库功能 2023-05-15 09:11:58 +08:00
ef710b9b5e rev: 成品入库前后端修改 2023-05-09 21:00:53 +08:00
33f27bfc81 基础分类修改 2023-03-17 18:21:21 +08:00
22ff161288 更新 2022-11-30 12:51:53 +08:00
87fdb2f2be 代码更新 2022-09-19 14:39:18 +08:00
e8063dfb4f 代码更新 2022-09-19 10:48:19 +08:00
8bc7f54bbc init 2022-06-27 19:25:41 +08:00