Commit Graph

1110 Commits

Author SHA1 Message Date
zhouz
d3ec5053e7 fix:分切优化 2024-07-15 12:30:19 +08:00
258428b276 Merge branch 'master' into master_merge 2024-07-15 09:52:19 +08:00
6f316d1960 fix:出库报表 2024-07-15 09:51:41 +08:00
4f63db49e0 Merge branch 'master' into master_merge 2024-07-15 09:11:28 +08:00
46bd8c83ee fix:新-出库报表导出 2024-07-15 09:09:27 +08:00
zhouz
e60a4a9794 fix:干燥剂模板 2024-07-15 09:02:49 +08:00
zhouz
c916dad331 fix:干燥剂模板 2024-07-14 18:37:39 +08:00
zhouz
586f51f093 fix:一期生箔优化 2024-07-14 13:00:01 +08:00
zhouz
67d1f7a5e4 fix:B1母卷上料优化 2024-07-13 23:48:21 +08:00
zhouz
2e67662a87 fix:B1母卷上料优化 2024-07-13 13:23:12 +08:00
zhouz
2c9b074efd fix:MES相关接口优化 2024-07-13 11:40:16 +08:00
zhouz
3ea3481c33 fix:MES相关接口优化 2024-07-13 08:30:55 +08:00
zhouz
64b5a0412e fix:生箔工序优化 2024-07-12 18:54:35 +08:00
zhouz
9326c96f31 fix:生箔工序优化 2024-07-12 18:45:13 +08:00
62774053a3 fix:增加桁架任务及二次分配任务完成情况校验 2024-07-11 19:26:58 +08:00
zhouz
ae0b82dd04 fix:生箔工序优化、出库托盘、木箱解绑 2024-07-11 09:17:01 +08:00
ed493f29fa Merge branch 'master' into master_merge 2024-07-10 13:58:56 +08:00
93c1c11f04 rev:出库报表新增原销售订单 2024-07-10 08:51:07 +08:00
zhouz
2c7bb98af5 fix:获取堆叠模版优化 2024-07-09 19:09:27 +08:00
254b4f4a65 rev:返检/改切出库回传删除子卷包装关系,成品入库报表新增查询条件 2024-07-09 14:42:54 +08:00
zhouz
3c443bc438 fix:库存更新优化 2024-07-09 12:49:26 +08:00
zhouz
769081dc48 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 17:28:03 +08:00
zhouz
313b9182c0 fix:出库代码优化 2024-07-08 17:27:47 +08:00
344a20d331 Merge branch 'b_lms' into master_merge 2024-07-08 16:46:08 +08:00
2b37eea4a0 revb:二期移库修改 2024-07-08 16:14:54 +08:00
476a761699 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 09:30:51 +08:00
37471bec9a feat: 优化、新增B1车间分切 2024-07-08 09:30:13 +08:00
zhouz
deddeb1f26 fix:代码合并 2024-07-08 09:26:13 +08:00
zhouz
d62c155d92 fix:B1生箔、烘箱、分切上料流程修改 2024-07-08 09:18:42 +08:00
b64b216e23 rev:木箱重量异常通知飞书 2024-07-08 08:47:32 +08:00
ludj
59dace36a0 rev:去除jetcache框架(存在bug) 2024-07-07 13:29:13 +08:00
b2a1e57417 opt:去除一楼内包间所有任务下发ACS的子卷号 2024-07-06 14:37:23 +08:00
6cc8921e1b opt:优化满轴位满或空载具位空的行架任务 2024-07-05 16:42:37 +08:00
zhouz
5ac116d1f0 fix:查询木箱信息优化 2024-07-04 18:07:09 +08:00
zhouz
89fe7c4488 fix:退货口入库优化 2024-07-04 15:31:01 +08:00
zhouz
4ab8648dd2 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-03 23:02:45 +08:00
zhouz
b6548b25aa fix:分切计划上线临时修改方案 2024-07-03 23:02:24 +08:00
c77a5f03e5 fix:增加任务校验 2024-07-03 17:32:25 +08:00
24678f2a47 合并 2024-07-03 16:46:44 +08:00
eaadc6b971 Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge 2024-07-03 16:45:36 +08:00
1f9ea990ec rev:sap推送改切计划根据仓库生成多个单据 2024-07-03 16:01:24 +08:00
9b1280fa76 fix:去除校验 2024-07-03 15:38:27 +08:00
zhouz
e8bccfced1 fix:发送数字孪生优化 2024-07-03 15:36:33 +08:00
zhouz
78703b146d fix:暂时去除锂电不允许表处的逻辑 2024-07-03 07:47:12 +08:00
5870a48fe4 Merge remote-tracking branch 'origin/b_lms' into master_merge 2024-07-02 22:45:29 +08:00
71f320e158 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-07-02 22:44:23 +08:00
f606c6a16a fix: pc可修改分切计划信息 2024-07-02 22:43:33 +08:00
3faf1b65c1 add:增加装箱区库存页面 2024-07-02 16:30:19 +08:00
zhouz
7824298f1a fix:MES相关接口优化 2024-07-02 16:26:30 +08:00
2f6cbfd9c1 rev: 立库堆垛机相关任务下发时 给托盘号 2024-07-02 13:29:00 +08:00