root/wms1.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,358 Commits 5 Branches 0 Tags
de0e4b62da7ea28dcea6b68cffecf299edf800a4
Commit Graph

1358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liuxy
8e624a40ce rev: 合并代码 2023-05-25 20:57:29 +08:00
liuxy
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
liuxy
65822e1864 rev : 出库分配 2023-05-25 20:38:18 +08:00
gengby
db98481387 REV 修改 2023-05-25 19:56:34 +08:00
zhangzhiqiang
1d2acd6d16 Merge remote-tracking branch 'origin/master' 2023-05-25 19:45:27 +08:00
zhangzhiqiang
87ca2d32d6 add:修改调度任务代码 2023-05-25 19:44:48 +08:00
gengby
22d4222e1f add 智能车间 2023-05-25 19:38:31 +08:00
USER-20220102CG\noblelift
021c4462af Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-25 19:27:35 +08:00
USER-20220102CG\noblelift
f73fdf49e6 add 老车间包装 2023-05-25 19:27:14 +08:00
liuxy
f530e6d7b4 add: 生产订单 2023-05-25 14:58:35 +08:00
zhangzhiqiang
b8da36f71b rev:生产调度修改 2023-05-25 10:32:38 +08:00
liuxy
84ecbf0b83 rev:库存更新，入库确认 2023-05-24 20:05:05 +08:00
zhangzhiqiang
1ce759c718 rev:生产调度相关 2023-05-24 09:42:52 +08:00
ZHOUZ\Noble'lift
db5c1de411 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-24 09:33:18 +08:00
ZHOUZ\Noble'lift
b022401963 rev:原材料出入库修改 2023-05-24 09:33:14 +08:00
liuxy
f581a3c4d1 rev: 代码错乱修改 2023-05-24 09:28:14 +08:00
liuxy
bdf18b0dc3 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-24 09:27:51 +08:00
liuxy
d5d4f74b5c rev: 代码错乱修改 2023-05-24 09:27:37 +08:00
gengby
13dbaca2ba rev ndc执行状态 2023-05-23 17:30:24 +08:00
zhangzhiqiang
25075b9fcd rev:新增工序调度 2023-05-23 16:21:14 +08:00
ZHOUZ\Noble'lift
ffdcba0faf add:新增订单扩展信息维护 2023-05-23 14:01:37 +08:00
ZHOUZ\Noble'lift
68a84a305a Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-23 13:57:40 +08:00
ZHOUZ\Noble'lift
38feec1324 rev:新增老车间工单下发和打印功能 2023-05-23 13:57:20 +08:00
USER-20220102CG\noblelift
98f976a16f Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-23 12:26:43 +08:00
USER-20220102CG\noblelift
2eba078ddb add 老车间包装线驱动 2023-05-23 12:26:30 +08:00
zhangzhiqiang
ba72c43ab6 Merge remote-tracking branch 'origin/master' 2023-05-23 10:15:03 +08:00
zhangzhiqiang
47fe472739 rev:配置文件改外网 2023-05-23 10:14:08 +08:00
liuxy
b3349b313f rev： 代码合并 2023-05-23 09:47:34 +08:00
zhangzhiqiang
4289769961 Merge remote-tracking branch 'origin/master' 2023-05-22 16:58:53 +08:00
zhangzhiqiang
f2a4fcb105 add:调度线路 2023-05-22 16:57:43 +08:00
ZHOUZ\Noble'lift
6ccc8bd551 rev:修改缓存线异常处理功能 2023-05-22 12:42:44 +08:00
ZHOUZ\Noble'lift
a229ccd9f8 rev:修改缓存线异常盘点功能 2023-05-22 12:28:21 +08:00
zhangzhiqiang
dbf6773d47 Merge remote-tracking branch 'origin/master' 2023-05-21 17:24:08 +08:00
ZHOUZ\Noble'lift
089a45b978 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-21 17:19:18 +08:00
ZHOUZ\Noble'lift
f01cf7bc98 fix:修改缓存线异常处理相关功能 2023-05-21 17:19:12 +08:00
zhangzhiqiang
6ab3264a4d rev:修改缓存线同步接口 2023-05-21 17:18:28 +08:00
USER-20220102CG\noblelift
b5aca2b6a8 add 老车间驱动 2023-05-19 17:15:48 +08:00
ZHOUZ\Noble'lift
2e691aaef9 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-19 14:56:34 +08:00
ZHOUZ\Noble'lift
15c59182aa fix:缓存线异常处理功能 2023-05-19 14:56:18 +08:00
USER-20220102CG\noblelift
9e60ebfbfa add 老车间设备驱动 2023-05-18 21:25:04 +08:00
zhangzhiqiang
d07f8d3f41 Merge remote-tracking branch 'origin/master' 2023-05-18 19:14:45 +08:00
zhangzhiqiang
090cd3830e rev：修改调度管理路径 2023-05-18 19:14:38 +08:00
USER-20220102CG\noblelift
e96c97aefd fix 日志 2023-05-17 20:47:30 +08:00
zhangzhiqiang
5bce32c4e9 Merge remote-tracking branch 'origin/master' 2023-05-17 17:36:48 +08:00
zhangzhiqiang
90469ea6ae add:修改工单相关 2023-05-17 17:36:40 +08:00
gengby
f6abc2cd3e rev 请求标记复位 2023-05-17 17:27:57 +08:00
gengby
a72caf0a31 rev 修复删除设备报错 分页显示问题 2023-05-17 17:26:50 +08:00
zhangzhiqiang
30db992ada add:工单及工单记录 2023-05-17 15:15:35 +08:00
ZHOUZ\Noble'lift
a97b32d3a9 Merge branch 'master' of http://121.40.234.130:8899/root/hl_one 2023-05-17 09:54:30 +08:00
ZHOUZ\Noble'lift
8026de6ec2 fix:原材料入库 2023-05-17 09:54:26 +08:00