Commit Graph

51 Commits

Author SHA1 Message Date
zhou keda
3afa57a2d0 优化调整 2024-05-28 14:02:44 +08:00
majian
fc74b3381f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev
Conflicts:
	BasicData/Tnb.BasicData.Entities/Entity/BasMaterial.cs
2024-05-24 14:33:09 +08:00
majian
36622b35cf 原材料转库逻辑变更 2024-05-24 14:24:21 +08:00
zhou keda
86d07260af 优化调整 2024-05-24 14:21:14 +08:00
zhou keda
50b8dedc7d bom中数量变成分子分母2个字段 2024-05-15 14:45:08 +08:00
majian
eadaa50ef7 销售出库与拣货接口以及部分问题修复 2024-05-14 15:29:18 +08:00
majian
579f2d3a39 bug处理 2024-04-23 10:16:16 +08:00
majian
4fbc6c0267 合并 2024-04-11 17:31:32 +08:00
yang.lee
5fde13ece9 库位导入功能代码调整 2023-12-11 15:06:43 +08:00
yang.lee
d61989417f Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-12-11 13:53:04 +08:00
yang.lee
0dd220ee4f 1、库位导入代码调整
2、电梯通信代码调整
2023-12-11 13:52:54 +08:00
zhou keda
e03fda5ae1 erp物料新增保存接口 2023-12-11 09:28:12 +08:00
yang.lee
ff37e58ef8 修复bug 2023-11-16 11:53:19 +08:00
zhoukeda
753e24741b 调整喷码贴标 2023-11-09 16:00:05 +08:00
fei.pan
c6b8dfc861 去除引用common.props 2023-11-06 19:35:59 +08:00
alex
38454456fc 库位,新增是否超配属性 2023-09-08 09:17:01 +08:00
zhoukeda
480e9d1e0e 物料清单子表数量整数改小数 2023-08-22 10:17:27 +08:00
alex
31a1f8a149 1 2023-08-04 17:17:31 +08:00
zhoukeda
ae80a0a971 提报数量限制 2023-07-28 09:55:13 +08:00
zhoukeda
9872642cc1 生产bom投入产出物料添加单位id 2023-07-25 09:08:19 +08:00
zhoukeda
74b13dcfbd 生产排产算预计结束时间 2023-07-20 14:04:21 +08:00
zhoukeda
630a8b76d0 系统二维码 2023-07-19 17:57:53 +08:00
alex
81f7672980 新增,判断目标库位是否可以放置当前载具 2023-07-18 10:38:44 +08:00
zhoukeda
844b76b823 消除warning 2023-07-07 15:54:43 +08:00
zhoukeda
902c0eb301 推送规则,异常停机推送 2023-07-06 11:18:02 +08:00
zhoukeda
179c50b8ba 生产bom修改 2023-07-06 08:39:22 +08:00
FanLian
ff66b1fa04 更改location的is_use字段为string 2023-07-04 11:03:28 +08:00
qianjiawei
7f8fdad324 工作日历 2023-06-29 17:47:37 +08:00
alex
bf0217998f 1 2023-06-28 14:40:00 +08:00
qianjiawei
d1053d09bd Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev 2023-06-27 17:29:46 +08:00
qianjiawei
8ee61dff20 工作日历 2023-06-27 17:29:40 +08:00
taomin0419
d23b8b125a 解决入库申请bug 2023-06-27 16:43:16 +08:00
alex
9990ba1147 将BaseLocation,is_use属性类型改为int 2023-06-27 14:11:27 +08:00
zhoukeda
d2ae9d8751 bug,生产bom工序添加排序和是否最后一道工序字段 2023-06-25 15:19:26 +08:00
zhoukeda
e563920a39 生产bom工序表添加工艺路线子表id,esop 2023-06-21 17:19:27 +08:00
zhoukeda
1e555f372f bug 2023-06-21 11:17:32 +08:00
zhoukeda
ead7fd1385 创建子工单 2023-06-20 17:35:18 +08:00
zhoukeda
aea9e3a9d5 去除warn 2023-06-19 16:27:13 +08:00
DEVICE8\12494
e81ea21af6 wms库房业务代码提交 2023-06-06 08:33:07 +08:00
PhilPan
3033b9c66e 重新生成实体类 2023-05-18 18:15:38 +08:00
PhilPan
31db0d5667 使用razor模板生成实体文件 2023-05-18 15:38:25 +08:00
DEVICE8\12494
8971b48984 1 2023-05-17 14:44:11 +08:00
DEVICE8\12494
fd3982b375 修复错误 2023-05-17 14:43:46 +08:00
PhilPan
524acb7704 id设为string 2023-05-17 14:27:32 +08:00
PhilPan
99b65418e8 重新生成Entity文件 2023-05-17 13:58:01 +08:00
PhilPan
408bbd8789 调整实体代码生成,增加string? 2023-05-16 19:52:52 +08:00
DEVICE8\12494
e7e2cea7bd 生产任务单代码调整 2023-05-16 14:16:59 +08:00
DEVICE8\12494
77bb079eee 生产管理模块代码调整 2023-05-12 22:58:16 +08:00
zhoukeda
208e6258d3 改bug 2023-05-09 17:25:33 +08:00
zhoukeda
b4ad3d26e2 物料增加信息 工艺路线弹窗增加过滤 2023-05-08 17:42:07 +08:00