dca76cdb096746f78e3b728e48bf985d517fce3c..55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a
2024-09-12 gongzuming
Merge remote-tracking branch 'origin/master-v2' into master-v2
55255f 对比 | 目录
2024-09-12 gongzuming
散户分配库位bug
06905a 对比 | 目录
已修改1个文件
2 ■■■ 文件已修改
src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/schedule/WarehouseScheduleService.java
@@ -85,8 +85,8 @@
                        }
                    }
                    if(customerOrders!=null && customerOrders.size()>0){ //散户订单
                        Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
                        for (Order order : customerOrders) {
                            Map<String, WarehouseLocationDTO> customerLocationMap = new HashMap<>();
                            if(locations!=null && locations.size()>0){
                                String key = order.getCreateBy()+"||"+order.getCustomerAddress();
                                WarehouseLocationDTO location = null;