|
|
effd8d5c79
|
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/rawmanage/service/iostorInv/impl/StIvtIostorinvOutYlServiceImpl.java
# mes/qd/src/views/wms/old_manage/old_package/index.vue
|
2023-05-26 16:29:08 +08:00 |
|
|
|
40ec3496ff
|
rev：新增原材料盘点、损溢；老车间包装
|
2023-05-26 16:24:02 +08:00 |
|
|
|
5dc0a51695
|
add: 出库强制确认
|
2023-05-26 15:56:06 +08:00 |
|
|
|
17880e035d
|
rev: 出入库界面修改
|
2023-05-26 09:39:21 +08:00 |
|
|
|
51513aaeea
|
fix：代码修复
|
2023-05-25 22:13:55 +08:00 |
|
|
|
cc15c50bbf
|
fix: 代码修复
|
2023-05-25 21:42:15 +08:00 |
|
|
|
8e624a40ce
|
rev: 合并代码
|
2023-05-25 20:57:29 +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 |
|
zhangzhiqiang
|
b8da36f71b
|
rev:生产调度修改
|
2023-05-25 10:32:38 +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 |
|
|
|
f581a3c4d1
|
rev: 代码错乱修改
|
2023-05-24 09:28: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 |
|
|
|
ffdcba0faf
|
add:新增订单扩展信息维护
|
2023-05-23 14:01:37 +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 |
|
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 |
|
|
|
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 |
|
|
|
6ccc8bd551
|
rev:修改缓存线异常处理功能
|
2023-05-22 12:42:44 +08:00 |
|
|
|
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 |
|
|
|
f01cf7bc98
|
fix:修改缓存线异常处理相关功能
|
2023-05-21 17:19:12 +08:00 |
|
zhangzhiqiang
|
6ab3264a4d
|
rev:修改缓存线同步接口
|
2023-05-21 17:18:28 +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 |
|
|
|
a97b32d3a9
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-17 09:54:30 +08:00 |
|
|
|
8026de6ec2
|
fix:原材料入库
|
2023-05-17 09:54:26 +08:00 |
|
zhangzhiqiang
|
b5e24c4fa8
|
add:物料基础
|
2023-05-15 20:39:47 +08:00 |
|
zhangzhiqiang
|
cc9f55ace0
|
add:基础管理/物料分类
|
2023-05-15 19:47:30 +08:00 |
|
|
|
9aeff869a6
|
rev: 成品入库分配修改
|
2023-05-15 11:53:40 +08:00 |
|
zhangzhiqiang
|
535b1a6b8c
|
rev：仓储基础管理维护
|
2023-05-15 11:23:04 +08:00 |
|
zhangzhiqiang
|
382f8e5503
|
rev:冲突处理
|
2023-05-15 09:53:32 +08:00 |
|
|
|
0bb532221b
|
rev:冲突解决
|
2023-05-15 09:39:46 +08:00 |
|
|
|
0f6b643ed3
|
rev:冲突处理
|
2023-05-15 09:37:42 +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 |
|
