|
|
f862349a78
|
add:成品盘点
|
2023-05-31 17:22:12 +08:00 |
|
zhangzhiqiang
|
432e5e020d
|
Merge remote-tracking branch 'origin/master'
|
2023-05-31 11:04:40 +08:00 |
|
zhangzhiqiang
|
efc8ade0ef
|
add:添加设备分配逻辑 rev:修改调度线路文件位置
|
2023-05-31 11:04:33 +08:00 |
|
|
|
408111084b
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-31 09:13:36 +08:00 |
|
|
|
d4b1400ed6
|
rev:半成品拼盘
|
2023-05-31 09:13:31 +08:00 |
|
|
|
392443fbf4
|
rev:半成品出入库、拼盘
|
2023-05-31 09:13:07 +08:00 |
|
zhangzhiqiang
|
85b5367584
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 19:55:57 +08:00 |
|
zhangzhiqiang
|
abb6df872d
|
rev:调度：缓存线任务
|
2023-05-30 19:55:50 +08:00 |
|
|
|
b97fe6683e
|
rev: 成品损益强制确认
|
2023-05-30 16:40:06 +08:00 |
|
zhangzhiqiang
|
ec2157cf91
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 14:56:40 +08:00 |
|
zhangzhiqiang
|
d172223109
|
rev:调度任务
|
2023-05-30 14:56:34 +08:00 |
|
|
|
02bc0fdb96
|
rev:成品损益修改
|
2023-05-29 20:34:40 +08:00 |
|
|
|
3de19fcecb
|
Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
|
2023-05-29 19:39:13 +08:00 |
|
|
|
ffafaa3c19
|
rev:半成品出入库修改
|
2023-05-29 19:39:08 +08:00 |
|
zhangzhiqiang
|
4d30da76de
|
Merge remote-tracking branch 'origin/master'
|
2023-05-29 17:13:31 +08:00 |
|
zhangzhiqiang
|
d093d6723d
|
rev：修改调度代码
|
2023-05-29 17:13:24 +08:00 |
|
|
|
3e0277b43e
|
add: 成品损益
|
2023-05-29 17:05:45 +08:00 |
|
|
|
3144e5f746
|
add:成品出库手动分配
|
2023-05-29 15:46:27 +08:00 |
|
zhangzhiqiang
|
27f8851f5d
|
rev:工单前端报工
|
2023-05-29 13:00:33 +08:00 |
|
zhangzhiqiang
|
9ae43259e3
|
rev:冲突处理
|
2023-05-29 12:15:59 +08:00 |
|
|
|
5ef00cf5ce
|
rev:代码合并
|
2023-05-29 10:49:49 +08:00 |
|
|
|
973425d6a8
|
rev:解决冲突
|
2023-05-29 10:24:49 +08:00 |
|
|
|
ce6f695e02
|
rev ： 出入库修改
|
2023-05-26 18:25:02 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b3349b313f
|
rev： 代码合并
|
2023-05-23 09:47:34 +08:00 |
|
|
|
a229ccd9f8
|
rev:修改缓存线异常盘点功能
|
2023-05-22 12:28:21 +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 |
|
|
|
8026de6ec2
|
fix:原材料入库
|
2023-05-17 09:54:26 +08:00 |
|
|
|
9aeff869a6
|
rev: 成品入库分配修改
|
2023-05-15 11:53:40 +08:00 |
|
