Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-04 de14adf3250bfecdf41600aa0ea8789111523ad1

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1001,7 +1001,7 @@

        order.setCreateTime(now);
        order.setUpdateTime(now);

        order.setUpstreamcode(param.getUpstreamcode());
        //订单状态
        order.setSettle(1L);
        //状态