Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

5 小时以前 aece48b253b2e0b814bbdf5ee3d474e8cf697122

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java

@@ -227,7 +227,7 @@
                                finishedGlassShelfEmitDetails.getUnit(),
                                finishedGlassShelfEmitDetails.getGlassShelfName());
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
                        finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(emitId);
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
                    }
                }

@@ -268,7 +268,8 @@
                            finishedGlassShelfEmitDetails.getMaxWeight(),
                            finishedGlassShelfEmitDetails.getMaxWidth(),
                            finishedGlassShelfEmitDetails.getMaxHeight(),
                            finishedGlassShelfEmitDetails.getGlassShelfName()
                            finishedGlassShelfEmitDetails.getGlassShelfName(),
                            object.get("userName").toString()
                    );
                    index++;
                }
@@ -416,7 +417,7 @@
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.deleteFinishedGlassShelfWithdrawDetails(withdrawId);
                        finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(withdrawId);
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
                    }
                }

@@ -460,7 +461,8 @@
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                                finishedGlassShelfWithdrawDetails.getGlassShelfName(),
                                object.get("userName").toString()
                        );
                        index++;
                    }