Commit Graph

31 Commits

Author SHA1 Message Date
赵正易
f26209ba45 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
2024-03-22 09:11:07 +08:00
qianhao.xu
dac58ddb77 仓库模块_出库货物记录:init 2024-03-22 08:54:11 +08:00
qianhao.xu
2074ea2e84 质量模块_质量统计: 添加颜色 2024-03-20 14:16:24 +08:00
赵正易
be26bfedce Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
2024-03-19 20:49:10 +08:00
qianhao.xu
a3d7b47a88 本地时间修正 2024-03-19 20:42:02 +08:00
qianhao.xu
beb48faf65 Revert "质量报表日期查询方式修改"
This reverts commit ca026042f7ae0d2702403a3bdc1b7d6e3757b070.
2024-03-19 20:42:02 +08:00
赵正易
28d83b147e 质量报表日期查询方式修改 2024-03-19 20:42:02 +08:00
赵正易
c6093a01ac Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES
# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json
2024-03-13 12:20:20 +08:00
qianhao.xu
d1a42a11e0 仓库管理-库位信息:初始化 2024-03-12 17:41:03 +08:00
赵正易
a0ae0c35b0 质量报表日期查询方式修改 2024-03-01 14:43:23 +08:00
赵正易
18938c7baf 获取初始日期代码修改 2024-02-27 08:37:46 +08:00
qianhao.xu
8a9176549a 质量报表时间 2024-02-24 15:33:40 +08:00
3a609eaa3e 1.添加原材料入库的Model DTO Service层Controller层代码
2.修改质量管理-FQCService逻辑【抛光报表,包装报表】的生产投入数的计算方式(未确定)
2024-02-23 18:09:19 +08:00
2d4128c5c5 修复提交 2024-02-21 13:54:45 +08:00
484518ebd6 Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES 2024-02-21 13:51:57 +08:00
ba5dc4c94d FirstFQCService添加#endregion防止报错
新增原材料入库接口
2024-02-21 13:49:57 +08:00
qianhao.xu
1d345a63b5 质量报表完成 2024-02-20 15:04:49 +08:00
qianhao.xu
fe07c5ba86 质量统计完成 2024-02-19 20:06:05 +08:00
qianhao.xu
e882094228 质量报表 2024-02-19 09:23:41 +08:00
qianhao.xu
0cb9162dfd 质量报表 2024-02-19 09:08:27 +08:00
qianhao.xu
4e3596af54 上线完成版 2024-02-04 16:07:27 +08:00
qianhao.xu
fc162aed3b 版本结束 2024-01-31 17:51:45 +08:00
qianhao.xu
a2295ee36d 检验完成 2024-01-29 16:55:45 +08:00
qianhao.xu
641e9c198a 首检完成 2024-01-26 16:59:00 +08:00
qianhao.xu
80ff5f04f2 质量统计完成 2023-12-18 16:01:17 +08:00
qianhao.xu
21ceea2a5b 质量统计 2023-12-15 14:41:15 +08:00
qianhao.xu
3429a1e39e 预备signalr 2023-12-01 15:39:07 +08:00
qianhao.xu
4fc6dd5d8c 提交 2023-11-29 16:41:11 +08:00
qianhao.xu
1ca03bd2a5 计划于物流结束 2023-11-28 18:18:56 +08:00
qianhao.xu
2a6ccc616e IQC 2023-11-27 16:28:16 +08:00
qianhao.xu
7ba84f96cd IQC开始 2023-11-24 20:40:45 +08:00