#

ytfl

2 天以前 1b43abdddc83ee73315a44481c4abd66ee545ca6

#

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -82,11 +82,11 @@

                        // 保存入库通知档历史档
                        if (!waitPakinLogService.save(wrkMast.getBarcode())) {
//                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                            exceptionHandle("保存入库通知档历史档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                        // 删除入库通知档
                        if (!waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", wrkMast.getBarcode()))) {
//                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                            exceptionHandle("删除入库通知档[workNo={0}]失败", wrkMast.getWrkNo());
                        }
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
@@ -113,8 +113,8 @@
//                }
            }

            wrkMast.setIoTime(new Date());
            wrkMastService.updateById(wrkMast);
            //wrkMast.setIoTime(new Date());
            //wrkMastService.updateById(wrkMast);

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -284,7 +284,21 @@
                                return FAIL.setMsg("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                            }
                        }

                        if (storeType != null) {
                            OrderDetl orderDetl = new OrderDetl();
                            orderDetl.sync(wrkDetl);
                            orderDetl.setOrderId(order.getId());
                            orderDetl.setOrderNo(order.getOrderNo());
                            orderDetl.setCreateBy(order.getCreateBy());
                            orderDetl.setCreateTime(now);
                            orderDetl.setUpdateBy(order.getCreateBy());
                            orderDetl.setUpdateTime(now);
                            orderDetl.setStatus(1);
                            orderDetl.setQty(wrkDetl.getAnfme());
                            if (!orderDetlService.insert(orderDetl)) {
                                throw new CoolException("保存订单明细档失败");
                            }
                        } else {
                        // 更新订单完成数量
                        //addOrderDetlQty(wrkMast, wrkDetl);
                        OrderDetlPakout orderDetlPakout;
@@ -312,6 +326,8 @@
                            }
                        } catch (Exception ignore) {
                        }
                        }


                    }
                    // 修改库位状态 Q ====>> F