Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -446,6 +446,9 @@
//                }
            } else {
                list.add(dto);
                if (!Cools.isEmpty(orderDetl.getThreeCode())){
                    orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                }
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(param.getDocType().intValue());
@@ -530,6 +533,9 @@
                    }
                } else {
                    dbList.add(dto);
                    if (!Cools.isEmpty(orderDetl.getThreeCode())){
                        orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                    }
                    orderDetl.setOrderId(order.getId());
                    orderDetl.setOrderNo(order.getOrderNo());
                    orderDetl.setSource(33);
@@ -600,6 +606,9 @@
                        }
                    } else {
                        dbList.add(dto);
                        if (!Cools.isEmpty(orderDetl.getThreeCode())){
                            orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                        }
                        orderDetl.setOrderId(order.getId());
                        orderDetl.setOrderNo(order.getOrderNo());
                        orderDetl.setSource(35);
@@ -711,6 +720,9 @@
                    }
                }
                list.add(dto);
                if (!Cools.isEmpty(orderDetl.getThreeCode())){
                    orderDetl.setThreeCode(orderDetl.getThreeCode().trim());
                }
                orderDetl.setOrderId(order.getId());
                orderDetl.setOrderNo(order.getOrderNo());
                orderDetl.setSource(docType);
@@ -1133,7 +1145,7 @@
                        throw new CoolException("生成单据主档失败，请重新导入！");
                    }
                }else {
                    order2.setSettle(order.getSettle() == 1L ? 1L : 2L );
                    order2.setSettle(order2.getSettle() == 1L ? 1L : 2L );
                    orderService.updateById(order2);
                }

@@ -1211,7 +1223,7 @@
                            throw new CoolException("生成单据主档失败，请重新导入！");
                        }
                    }else {
                        order3.setSettle(order.getSettle() == 1L ? 1L : 2L );
                        order3.setSettle(order3.getSettle() == 1L ? 1L : 2L );
                        orderService.updateById(order3);
                    }