Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

59 分钟以前 b0a4de74b47e2626f51eb4a844db3e62f6a4bf9d

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

@@ -165,6 +165,9 @@
        List<Map<String, Object>> mapList=new ArrayList<>();
        for(Map<String, Object> objectMap:object){
            mapList.add(finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationInId(
                    objectMap.get("glassShelfName").toString(),
                    Double.parseDouble(objectMap.get("price").toString()),
                    objectMap.get("unit").toString(),
                    Double.parseDouble(objectMap.get("weight").toString()),
                    Double.parseDouble(objectMap.get("width").toString()),
                    Double.parseDouble(objectMap.get("height").toString())
@@ -219,9 +222,12 @@
                                finishedGlassShelfEmitDetails.getMaxWeight(),
                                finishedGlassShelfEmitDetails.getMaxWidth(),
                                finishedGlassShelfEmitDetails.getMaxHeight(),
                                finishedGlassShelfEmitDetails.getQuantity());
                                finishedGlassShelfEmitDetails.getQuantity(),
                                finishedGlassShelfEmitDetails.getPrice(),
                                finishedGlassShelfEmitDetails.getUnit(),
                                finishedGlassShelfEmitDetails.getGlassShelfName());
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
                        finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(emitId);
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
                    }
                }

@@ -245,7 +251,10 @@
                            finishedGlassShelfEmitDetails.getMaxWeight(),
                            finishedGlassShelfEmitDetails.getMaxWidth(),
                            finishedGlassShelfEmitDetails.getMaxHeight(),
                            finishedGlassShelfEmitDetails.getQuantity());
                            finishedGlassShelfEmitDetails.getQuantity(),
                            finishedGlassShelfEmitDetails.getPrice(),
                            finishedGlassShelfEmitDetails.getUnit(),
                            finishedGlassShelfEmitDetails.getGlassShelfName());
                    finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetails(oddNumber,index,finishedGlassShelfEmitDetails);
                    finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetailsLog(
                            oddNumber,
@@ -258,7 +267,9 @@
                            finishedGlassShelfEmitDetails.getRemarks(),
                            finishedGlassShelfEmitDetails.getMaxWeight(),
                            finishedGlassShelfEmitDetails.getMaxWidth(),
                            finishedGlassShelfEmitDetails.getMaxHeight()
                            finishedGlassShelfEmitDetails.getMaxHeight(),
                            finishedGlassShelfEmitDetails.getGlassShelfName(),
                            object.get("userName").toString()
                    );
                    index++;
                }
@@ -327,7 +338,10 @@
                                    finishedGlassShelfEmitDetails.getMaxWeight(),
                                    finishedGlassShelfEmitDetails.getMaxWidth(),
                                    finishedGlassShelfEmitDetails.getMaxHeight(),
                                    finishedGlassShelfEmitDetails.getQuantity());
                                    finishedGlassShelfEmitDetails.getQuantity(),
                                    finishedGlassShelfEmitDetails.getPrice(),
                                    finishedGlassShelfEmitDetails.getUnit(),
                                    finishedGlassShelfEmitDetails.getGlassShelfName());
                            finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
                        }
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
@@ -397,10 +411,13 @@
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getQuantity()
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.deleteFinishedGlassShelfWithdrawDetails(withdrawId);
                        finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(withdrawId);
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
                    }
                }

@@ -426,7 +443,10 @@
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getQuantity()
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.insertFinishedGlassShelfWithdrawDetails(oddNumber,index,finishedGlassShelfWithdrawDetails);
                        finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetailsLog(
@@ -440,7 +460,9 @@
                                finishedGlassShelfWithdrawDetails.getRemarks(),
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight()
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName(),
                                object.get("userName").toString()
                        );
                        index++;
                    }
@@ -538,7 +560,10 @@
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getQuantity()
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
                    }