root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,594 Commits 1 Branch 0 Tags
62774053a3fb3b0f2f0b5435942b85da5ae031e0
Commit Graph

1096 Commits

Author SHA1 Message Date
gongbaoxiong
62774053a3 fix:增加桁架任务及二次分配任务完成情况校验 2024-07-11 19:26:58 +08:00
zhouz
ae0b82dd04 fix:生箔工序优化、出库托盘、木箱解绑 2024-07-11 09:17:01 +08:00
liuxy
ed493f29fa Merge branch 'master' into master_merge 2024-07-10 13:58:56 +08:00
liuxy
93c1c11f04 rev:出库报表新增原销售订单 2024-07-10 08:51:07 +08:00
zhouz
2c7bb98af5 fix:获取堆叠模版优化 2024-07-09 19:09:27 +08:00
liuxy
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
liuxy
344a20d331 Merge branch 'b_lms' into master_merge 2024-07-08 16:46:08 +08:00
liuxy
2b37eea4a0 revb：二期移库修改 2024-07-08 16:14:54 +08:00
liyongde
476a761699 Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-08 09:30:51 +08:00
liyongde
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
liuxy
b64b216e23 rev：木箱重量异常通知飞书 2024-07-08 08:47:32 +08:00
ludj
59dace36a0 rev：去除jetcache框架(存在bug) 2024-07-07 13:29:13 +08:00
gongbaoxiong
b2a1e57417 opt:去除一楼内包间所有任务下发ACS的子卷号 2024-07-06 14:37:23 +08:00
gongbaoxiong
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
gongbaoxiong
c77a5f03e5 fix:增加任务校验 2024-07-03 17:32:25 +08:00
liuxy
24678f2a47 合并 2024-07-03 16:46:44 +08:00
liuxy
eaadc6b971 Merge commit '1f9ea990ecd9811e2002ef491e2fc57ae1848490' into master_merge 2024-07-03 16:45:36 +08:00
liuxy
1f9ea990ec rev：sap推送改切计划根据仓库生成多个单据 2024-07-03 16:01:24 +08:00
gongbaoxiong
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
liyongde
5870a48fe4 Merge remote-tracking branch 'origin/b_lms' into master_merge 2024-07-02 22:45:29 +08:00
liyongde
71f320e158 Merge remote-tracking branch 'origin/b_lms' into b_lms 2024-07-02 22:44:23 +08:00
liyongde
f606c6a16a fix: pc可修改分切计划信息 2024-07-02 22:43:33 +08:00
gongbaoxiong
3faf1b65c1 add:增加装箱区库存页面 2024-07-02 16:30:19 +08:00
zhouz
7824298f1a fix:MES相关接口优化 2024-07-02 16:26:30 +08:00
liuxy
2f6cbfd9c1 rev： 立库堆垛机相关任务下发时 给托盘号 2024-07-02 13:29:00 +08:00
gongbaoxiong
1a72a6cb78 opt:优化一楼装箱区任务类相关校验 2024-07-02 13:12:34 +08:00
zhouz
b3227f1a8d Merge remote-tracking branch 'origin/master_merge' into master_merge 2024-07-01 16:45:18 +08:00
zhouz
efafb265eb fix:MES相关接口优化 2024-07-01 16:42:00 +08:00
liuxy
7f201dba96 rev：代码合并 2024-07-01 15:13:51 +08:00
liuxy
69b58c9d06 Merge branch 'master' into master_merge 2024-07-01 15:13:07 +08:00
liuxy
e9f415d8cf rev：改切入库回传 2024-07-01 15:10:58 +08:00
liuxy
4c07bdbfca Merge branch 'master_merge' of http://121.40.234.130:8899/root/lanzhouhailiang_one into master_merge 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/BstIvtBoxinfo.java
 2024-07-01 13:58:54 +08:00
zhouz
729afce407 fix:WQL数据新增，入烘箱优化 2024-06-30 18:54:13 +08:00
gongbaoxiong
9ecc870369 opt:优化子卷装箱校验逻辑 2024-06-30 18:10:59 +08:00
zhouz
35ccff0564 fix:重量校验 2024-06-30 15:18:44 +08:00
zhouz
c0ba71e24b Merge branch 'refs/heads/b_lms' into master_merge 2024-06-29 21:53:14 +08:00
zhouz
79d0e10a43 fix:WQL文件修改 2024-06-29 21:52:46 +08:00
zhouz
371cc4abee Merge branch 'refs/heads/b_lms' into master_merge 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
 2024-06-29 19:10:34 +08:00
zhouz
3ca403632d fix:WQL合并 2024-06-29 19:09:29 +08:00